From abc309c2928f018d2f81683a665aafb4a53054b4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis@ez13.net>
Date: Wed, 25 Sep 2019 13:56:38 -0700
Subject: [PATCH 001/354] set the path as ContainerAdministration as a machine
 varibale (#273)

Fixes #272
---
 release/preview/nanoserver1809/docker/Dockerfile | 15 +++++++++++++--
 release/stable/nanoserver1809/docker/Dockerfile  | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index 919fc5eee..4e77e8d35 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -72,8 +72,19 @@ ENV ProgramFiles="C:\Program Files" `
     WindowsPATH="C:\Windows\system32;C:\Windows" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
 
-    # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index cb72f754c..d5fd31ed8 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -69,8 +69,19 @@ ENV ProgramFiles="C:\Program Files" `
     # Set the default windows path so we can use it
     WindowsPATH="C:\Windows\system32;C:\Windows"
 
-    # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 

From 1675dfe44a3df9bb4e71fd2464b9e86cf7ef9a90 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sat, 5 Oct 2019 16:18:08 -0500
Subject: [PATCH 002/354] Add centos8 image (#277)

* Add centos8 image

* update dependabot config

* Add centos8 to CI system

* disable stable for centos8
---
 .dependabot/config.yml                        |  2 +-
 .../dependabot/Dockerfile                     |  2 +-
 release/preview/centos8/docker/Dockerfile     | 74 +++++++++++++++++++
 release/preview/centos8/getLatestTag.ps1      | 14 ++++
 release/preview/centos8/meta.json             | 14 ++++
 .../centos8/test-deps/docker/Dockerfile       | 38 ++++++++++
 release/preview/centos8/test-deps/meta.json   | 15 ++++
 vsts-ci.yml                                   |  7 ++
 8 files changed, 164 insertions(+), 2 deletions(-)
 rename release/preview/{centos7 => centos8}/dependabot/Dockerfile (91%)
 create mode 100644 release/preview/centos8/docker/Dockerfile
 create mode 100644 release/preview/centos8/getLatestTag.ps1
 create mode 100644 release/preview/centos8/meta.json
 create mode 100644 release/preview/centos8/test-deps/docker/Dockerfile
 create mode 100644 release/preview/centos8/test-deps/meta.json

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index 59116a1eb..fc8e973a2 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -8,7 +8,7 @@ update_configs:
     update_schedule: "daily"
 
   - package_manager: "docker"
-    directory: "/release/preview/centos7/dependabot"
+    directory: "/release/preview/centos8/dependabot"
     update_schedule: "daily"
 
   - package_manager: "docker"
diff --git a/release/preview/centos7/dependabot/Dockerfile b/release/preview/centos8/dependabot/Dockerfile
similarity index 91%
rename from release/preview/centos7/dependabot/Dockerfile
rename to release/preview/centos8/dependabot/Dockerfile
index 719a84023..5bd787a7a 100644
--- a/release/preview/centos7/dependabot/Dockerfile
+++ b/release/preview/centos8/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM centos:7
+FROM centos:8
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
new file mode 100644
index 000000000..a69eff4aa
--- /dev/null
+++ b/release/preview/centos8/docker/Dockerfile
@@ -0,0 +1,74 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=8
+ARG imageRepo=centos
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=6.2.0-preview.2
+ARG PACKAGE_VERSION=6.2.0_preview.2
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+ARG fromTag=7
+ARG imageRepo=centos
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/preview/centos8/getLatestTag.ps1 b/release/preview/centos8/getLatestTag.ps1
new file mode 100644
index 000000000..9f6c243eb
--- /dev/null
+++ b/release/preview/centos8/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the CentOS image on Docker
+
+# The versions of CentOS we care about
+$shortTags = @('8')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
new file mode 100644
index 000000000..01a1cf7dc
--- /dev/null
+++ b/release/preview/centos8/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "#psversion#-centos-#tag#",
+        "preview-centos-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
+}
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..d343eca55
--- /dev/null
+++ b/release/preview/centos8/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/centos8/test-deps/meta.json b/release/preview/centos8/test-deps/meta.json
new file mode 100644
index 000000000..84f9bc64f
--- /dev/null
+++ b/release/preview/centos8/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "preview-centos-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 575
+    }
+}
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 98ddeafd3..9042950ff 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -38,6 +38,13 @@ jobs:
     name: centos7
     imagename: centos7
 
+- template: .vsts-ci/phase.yml
+  parameters:
+    name: centos8
+    imagename: centos8
+    stable: false
+    preview: true
+
 - template: .vsts-ci/phase.yml
   parameters:
     name: fedora

From ad9f3e049c499c1f30c955910e7f958fcba5de2f Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 11 Oct 2019 02:50:31 +0800
Subject: [PATCH 003/354] Update libicu package information for Kali (#279)

* Fix Issue 254

* Fix yaml block issue

* Fix POSIX compliance on Dockerfiles

Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>
---
 .../kali-rolling/docker/Dockerfile             | 18 +++++++++---------
 vsts-ci.yml                                    | 17 ++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/release/community-stable/kali-rolling/docker/Dockerfile b/release/community-stable/kali-rolling/docker/Dockerfile
index 32d971ebf..b464c16d9 100644
--- a/release/community-stable/kali-rolling/docker/Dockerfile
+++ b/release/community-stable/kali-rolling/docker/Dockerfile
@@ -11,7 +11,7 @@ ARG imageRepo=kalilinux/kali-linux-docker
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -20,16 +20,16 @@ ARG PS_INSTALL_VERSION=6
 ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
 
 # Define Args for the needed to add the package
-ARG KALI_REPO_KEY_PACKAGE_URL=https://http.kali.org/kali/pool/main/k/kali-archive-keyring/kali-archive-keyring_2018.1_all.deb
+ARG KALI_REPO_KEY_PACKAGE_URL=https://http.kali.org/kali/pool/main/k/kali-archive-keyring/kali-archive-keyring_2018.2_all.deb
 
 # Download the Kali repository package and save it
-ADD ${KALI_REPO_KEY_PACKAGE_URL} /tmp/kali-archive-keyring_2018.1_all.deb
+ADD ${KALI_REPO_KEY_PACKAGE_URL} /tmp/kali-archive-keyring_2018.2_all.deb
 
 # Define Args for the needed to add the package
-ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u2_amd64.deb
+ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
 
 # Download the libicu57 Debian package and save it
-ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u2_amd64.deb
+ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u3_amd64.deb
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -50,13 +50,13 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 # Installation
 RUN \
     # install kali package to renew kali repository expired certificate in container image
-    apt-get install /tmp/kali-archive-keyring_2018.1_all.deb \
+    apt-get install /tmp/kali-archive-keyring_2018.2_all.deb \
     # remove kali package
-    && rm -f /tmp/kali-archive-keyring_2018.1_all.deb \
+    && rm -f /tmp/kali-archive-keyring_2018.2_all.deb \
     # install required libicu57 package
-    && dpkg -i /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
+    && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # remove libicu57 package
-    && rm -f /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
+    && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # update package list
     && apt-get update \
     # install dependencies
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 9042950ff..6a68788c0 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -101,14 +101,14 @@ jobs:
     stable: false
     preview: true
 
-#- template: .vsts-ci/phase.yml
-#  parameters:
-#    name: kaliRolling
-#    imagename: kali-rolling
-#    stable: false
-#    preview: false
-#    communityStable: true
-#    continueonerror: false
+- template: .vsts-ci/phase.yml
+  parameters:
+    name: kaliRolling
+    imagename: kali-rolling
+    stable: false
+    preview: false
+    communityStable: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:
@@ -128,7 +128,6 @@ jobs:
     communityStable: true
     continueonerror: true
 
-
 - template: .vsts-ci/phase.yml
   parameters:
     name: parrot

From 69202697a32dda2eb3d51fbda6faf35929112170 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 10 Oct 2019 17:47:17 -0400
Subject: [PATCH 004/354] Update poshchan config (#286)

---
 .poshchan/settings.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.poshchan/settings.json b/.poshchan/settings.json
index d3a653228..82cb4ec5c 100644
--- a/.poshchan/settings.json
+++ b/.poshchan/settings.json
@@ -4,12 +4,14 @@
         "organization": "powershell",
         "project": "docker",
         "build_targets": {
-            "CI": "Docker-PR"
+            "CI": "docker-PR",
+            "secretscan": "Docker-CI-Secret-Scan",
         },
         "authorized_users": [
             "SteveL-MSFT",
             "TravisEz13",
-            "anmenaga"
+            "anmenaga",
+            "RDIL"
         ],
     },
     "failures": {

From d41747a74f1592608373c526a53366aca6bcb90e Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 11 Oct 2019 10:56:06 +0800
Subject: [PATCH 005/354] Fix ArchLinux failing (#281)

* Fix ArchLinux

* Set continueonerror to false on ArchLinux
---
 release/community-stable/archlinux/docker/Dockerfile | 5 +----
 vsts-ci.yml                                          | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index 08f7d3576..cb047cf45 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -11,7 +11,7 @@ ARG imageRepo=archlinux/base
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -77,9 +77,6 @@ RUN \
     # upgrade distro
     && pacman -Syyu --noconfirm \
     # clean downloaded packages
-    # create /var/cache/pacman/pkg directory to prevent pacman -Scc generating
-    # an error output about this missing directory
-    && mkdir /var/cache/pacman/pkg \
     && yes | pacman -Scc
 
 # Define args needed only for the labels
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 6a68788c0..0a809abd7 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -117,7 +117,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
-    continueonerror: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:

From 05727846728362541a520eac6b459f2b952afa56 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 11 Oct 2019 23:56:28 +0800
Subject: [PATCH 006/354] Fix BlackArch failing (#283)

* Fix 282

* Set continueonerror to false on yml
---
 release/community-stable/blackarch/docker/Dockerfile | 5 +----
 vsts-ci.yml                                          | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 922ccab7b..308e13405 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -18,7 +18,7 @@ ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh
 ADD ${BlackArch_Strap_URL} /tmp/strap.sh
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -92,9 +92,6 @@ RUN \
     # upgrade distro
     && pacman -Syyu --noconfirm \
     # clean downloaded packages
-    # create /var/cache/pacman/pkg directory to prevent pacman -Scc generating
-    # an error output about this missing directory
-    && mkdir /var/cache/pacman/pkg \
     && yes | pacman -Scc
 
 # Define args needed only for the labels
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 0a809abd7..402492797 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -126,7 +126,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
-    continueonerror: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:

From 32e860cbfebadd86d9a44da7d27565faf87b281b Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Fri, 11 Oct 2019 12:24:10 -0400
Subject: [PATCH 007/354] Document image purpose (#285)

* Document image purpose

* Address feedback
---
 docs/index.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/index.md

diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 000000000..a9bbb944d
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,17 @@
+# PowerShell-Docker
+
+Hello!
+This is the main documentation page for PowerShell-Docker, so here you can find some helpful details for different questions.
+
+## Image Purpose
+
+These images are built so that PowerShell users can run the program in a containerized environment - see [this article](https://opensource.com/resources/what-docker) for what Docker is, and some basic pros and cons.
+Another reason Docker containers can be important is space. These images are purposefully small, and may require extra libraries to be installed for your use case.
+
+### `test-dep` Images
+
+Some images have a sub image (called `test-dep` images). These images are intended to allow running tests in [Azure DevOps](https://azure.microsoft.com/en-us/product-categories/devops/) for PowerShell.
+
+## Development
+
+See the [development docs](./development.md)

From 8ebdc6c782a8bf65fed0d9ebae0415ee5c809923 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sat, 12 Oct 2019 18:45:09 -0400
Subject: [PATCH 008/354] ClearLinux: Set SkipWebCmdletTests to false - Mirror
 #177 (#287)

---
 release/community-stable/clearlinux/docker/Dockerfile | 8 ++++++--
 release/community-stable/clearlinux/meta.json         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
index 98c677362..adc2f39e1 100644
--- a/release/community-stable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -35,8 +35,10 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Installation
 RUN \
+    # generate trust store
+    clrtrust generate -f \
     # install dependencies
-    swupd bundle-add \
+    && swupd bundle-add \
       # required libstdc++.so.6
       # required bundle to make less executable
       os-core-dev \
@@ -78,8 +80,10 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux-${fromTag}
 
 RUN \
+    # generate trust store
+    clrtrust generate -f \
     # install dependencies
-    swupd bundle-add \
+    && swupd bundle-add \
       # required package for International Components for Unicode
       runtime-libs-boost \
     # Create the pwsh symbolic link that points to powershell
diff --git a/release/community-stable/clearlinux/meta.json b/release/community-stable/clearlinux/meta.json
index 3fa7b861b..62ace397f 100644
--- a/release/community-stable/clearlinux/meta.json
+++ b/release/community-stable/clearlinux/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
-    "SkipWebCmdletTests": true,
+    "SkipWebCmdletTests": false,
     "tagTemplates": [
         "#psversion#-clearlinux-#tag#",
         "clearlinux-#shorttag#"

From 57246a6fc2f6ff7758157fdd68dbb1a129efe0f5 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 17 Oct 2019 09:42:05 -0400
Subject: [PATCH 009/354] Minor tweaks and improvements to build.ps1 (#293)

---
 build.ps1 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 11f0dbfd2..823ab25d5 100644
--- a/build.ps1
+++ b/build.ps1
@@ -177,10 +177,9 @@ Begin {
     if ($PSCmdlet.ParameterSetName -notin 'GenerateTagsYaml', 'DupeCheckAll' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
-
-        # We are using the Channel parameter, so assign the variable to that
     }
 
+    # We are using the Channel parameter, so assign the variable to that
     $Channels = $Channel
 
     $sasData = $null
@@ -244,15 +243,11 @@ End {
             $message = "Channel: $nameForMessage does not exist.  Not every image exists in every channel.  Skipping."
             if(!$allMeta)
             {
+                Write-Warning $message
                 if($CI.IsPresent -and !$GetTags.IsPresent)
                 {
-                    Write-Warning $message
                     throw $message
                 }
-                else
-                {
-                    Write-Warning $message
-                }
             }
             else
             {

From 2c9ea90a8dea9361a1295e8e6ed9470f28950d30 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 18 Oct 2019 03:11:28 +0800
Subject: [PATCH 010/354] Fix ParrotSec failing (#290)

* Fix issue 289

* update yml to set continuronerror to false

* Update tag from 4.4 to latest
---
 release/community-stable/parrot/docker/Dockerfile | 12 ++++++------
 release/community-stable/parrot/getLatestTag.ps1  |  2 +-
 vsts-ci.yml                                       |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/release/community-stable/parrot/docker/Dockerfile b/release/community-stable/parrot/docker/Dockerfile
index 51454819a..fd66439ce 100644
--- a/release/community-stable/parrot/docker/Dockerfile
+++ b/release/community-stable/parrot/docker/Dockerfile
@@ -5,7 +5,7 @@
 # installed from Debian9 PowerShell package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=4.4
+ARG fromTag=latest
 ARG imageRepo=parrotsec/parrot-core
 
 FROM ${imageRepo}:${fromTag} AS installer-env
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 ENTRYPOINT [ ]
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -23,10 +23,10 @@ ARG PS_INSTALL_VERSION=6
 ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
 
 # Define Args for the needed to add the package
-ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u2_amd64.deb
+ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
 
 # Download the libicu57 Debian package and save it
-ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u2_amd64.deb
+ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u3_amd64.deb
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -63,9 +63,9 @@ RUN \
     # generate locale
     && locale-gen && update-locale \
     # install required libicu57 package
-    && dpkg -i /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
+    && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # remove libicu57 package
-    && rm -f /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
+    && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # install powershell package
     && apt-get install -y /tmp/powershell.deb \
     # remove powershell package
diff --git a/release/community-stable/parrot/getLatestTag.ps1 b/release/community-stable/parrot/getLatestTag.ps1
index 169b91911..db4bd1568 100644
--- a/release/community-stable/parrot/getLatestTag.ps1
+++ b/release/community-stable/parrot/getLatestTag.ps1
@@ -4,7 +4,7 @@
 # return objects representing the tags we need to base the parrot image on
 
 # The versions of parrot we care about
-$shortTags = @('4.4')
+$shortTags = @('latest')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 402492797..6766e31c6 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -135,7 +135,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
-    continueonerror: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:
@@ -144,6 +144,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:
@@ -152,6 +153,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
+    continueonerror: false
 
 - template: .vsts-ci/phase.yml
   parameters:
@@ -169,6 +171,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
+    continueonerror: false
 
 
 # The -CI filters to LTSC-2016 for nanoserver by default, which is the only thing that works on Hosted VS2017

From dcaeef9bb4f4c872be51cd086965c46c8097c6f7 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 18 Oct 2019 03:12:08 +0800
Subject: [PATCH 011/354] Add NTLM remoting to BlackArch using multi-stage
 builds (#294)

* add multi-stage builds to build gss-ntlmssp pkg

* set SkipGssNtlmSspTests to false
---
 .../blackarch/docker/Dockerfile               | 41 +++++++++++++++++++
 release/community-stable/blackarch/meta.json  |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 308e13405..7765ef5e2 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -11,6 +11,45 @@ ARG imageRepo=archlinux/base
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
+RUN \
+    # create a builduser
+    useradd builduser -m \
+    # delete the builduser password
+    && passwd -d builduser \
+    # enable builduser to sudo without password
+    && printf 'root ALL=(ALL) ALL\n' | tee -a /etc/sudoers \
+    # update package database
+    && pacman -Syy \
+    # install dependencies
+    && pacman -S --noconfirm \
+      # required sudo
+      sudo \
+      # required for uncompressing tar files
+      tar \
+      # required to clone gss-ntlmssp git repository
+      git \
+      # required to make gss-ntlmssp binary package
+      base-devel \
+      libwbclient \
+      docbook-xsl \
+      doxygen \
+    # change current root path to tmp directory path
+    && cd /tmp \
+    # clone the gss-ntlmssp package repository
+    && git clone https://aur.archlinux.org/gss-ntlmssp.git \
+    # change the cloned gss-ntlmssp package repository directory permission
+    && chmod 777 /tmp/gss-ntlmssp/ \
+    # change current path to gss-ntlmssp package repository folder path
+    && cd gss-ntlmssp \
+    # utilise sudo to builduser in order to make the gss-ntlmssp package
+    && sudo -u builduser bash -c makepkg -s --noconfirm
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
+
 # Define Args for the needed for BlackArch Linux
 ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh
 
@@ -68,6 +107,8 @@ RUN \
       openssl-1.0 \
       # required for uncompressing tar files
       tar \
+    # install gss-ntlmssp package from the previous stage
+    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # uncompress powershell linux tar file
diff --git a/release/community-stable/blackarch/meta.json b/release/community-stable/blackarch/meta.json
index 3bdf67df3..7bec3b377 100644
--- a/release/community-stable/blackarch/meta.json
+++ b/release/community-stable/blackarch/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "SkipGssNtlmSspTests": true,
+    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-blackarch-#tag#",
         "blackarch-#shorttag#"

From 9cda37cec4d45ea1e36c7bffc327c0d1ba54ddd8 Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <trevor@trevorsullivan.net>
Date: Thu, 17 Oct 2019 12:12:38 -0700
Subject: [PATCH 012/354] Update Dockerfile for ARM to PowerShell Core 6.2.3
 (#295)

---
 release/stable/arm32v7/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 93ebac99b..7e6b6e8f3 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM arm32v7/ubuntu:bionic
 
-ENV PS_VERSION=6.2.0
+ENV PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
 ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 

From 1e3bf276976666a41497b4ad9b7df9559e4b5055 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Wed, 23 Oct 2019 15:20:07 +0800
Subject: [PATCH 013/354] Update OracleLinux (#299)

* update oraclelinux dockerfile

* set SkipGssNtlmSspTests from true to false
---
 .../community-stable/oraclelinux/docker/Dockerfile  | 13 ++++++++-----
 .../community-stable/oraclelinux/getLatestTag.ps1   |  4 ++--
 release/community-stable/oraclelinux/meta.json      |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index c82842c90..609af9fea 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -5,13 +5,13 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=7.5
+ARG fromTag=latest
 ARG imageRepo=oraclelinux
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -31,12 +31,16 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-${fromTag}
 
 # Installation
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
+RUN \
+    # download PowerShell rpm package
+    curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # install dependencies
     && yum install -y \
 	    # required for help in powershell
 	    less \
+      # install EPEL repository
 	    epel-release \
+      # install gssntlmssp package from EPEL repository
 	    gssntlmssp \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
@@ -58,8 +62,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # clean cached data
     && yum clean all \
     # remove cache folders and files
-    && rm -rf /var/cache/yum \
-    && find /. -name 'gssntlmssp.so' -exec echo {} \;
+    && rm -rf /var/cache/yum
 
 # Define args needed only for the labels
 ARG IMAGE_NAME=pshorg/powershellcommunity:oraclelinux-7.5
diff --git a/release/community-stable/oraclelinux/getLatestTag.ps1 b/release/community-stable/oraclelinux/getLatestTag.ps1
index f4f21feb2..0416f52fa 100644
--- a/release/community-stable/oraclelinux/getLatestTag.ps1
+++ b/release/community-stable/oraclelinux/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the oracle linux image on
 
 # The versions of oracle linux we care about
-$shortTags = @('7.5')
+$shortTags = @('latest')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "oraclelinux" -FullTagFilter '^7.5$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "oraclelinux" -FullTagFilter '^latest$' -OnlyShortTags
diff --git a/release/community-stable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
index a3b6afc86..66b311784 100644
--- a/release/community-stable/oraclelinux/meta.json
+++ b/release/community-stable/oraclelinux/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
+    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-oraclelinux-#tag#",
         "oraclelinux-#shorttag#"

From f4a7ca871a5ff4f32780ae719037da4088bbeeb1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 24 Oct 2019 14:31:16 -0700
Subject: [PATCH 014/354] Fix kali tag selection (#302)

---
 .vsts-ci/phase.yml                                     | 9 +++++++++
 release/community-stable/kali-rolling/getLatestTag.ps1 | 4 ++--
 release/community-stable/parrot/docker/Dockerfile      | 6 ++++--
 release/community-stable/parrot/getLatestTag.ps1       | 4 ++--
 vsts-ci.yml                                            | 2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index bae46f0ab..3020940fd 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -60,6 +60,15 @@ jobs:
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
+  - powershell: |
+      $files = @(Get-ChildItem -Recurse test*.xml)
+      if($files.count -eq 0) {
+        throw 'no test results found'
+      }
+    displayName: Make sure we got test results
+    condition: succeededOrFailed()
+    continueOnError: ${{ parameters.continueonerror }}
+
   - task: PublishTestResults@2
     condition: succeededOrFailed()
     displayName: Publish $(ImageName) Test Results **\test*.xml
diff --git a/release/community-stable/kali-rolling/getLatestTag.ps1 b/release/community-stable/kali-rolling/getLatestTag.ps1
index 5ffafe0c3..266872373 100644
--- a/release/community-stable/kali-rolling/getLatestTag.ps1
+++ b/release/community-stable/kali-rolling/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the kali image on
 
 # The versions of kali we care about
-$shortTags = @('kali-rolling')
+$shortTags = @('latest')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "kalilinux/kali-linux-docker" -FullTagFilter '^kali-rolling$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "kalilinux/kali-rolling" -FullTagFilter '^latest$' -OnlyShortTags
diff --git a/release/community-stable/parrot/docker/Dockerfile b/release/community-stable/parrot/docker/Dockerfile
index fd66439ce..954a2dfc0 100644
--- a/release/community-stable/parrot/docker/Dockerfile
+++ b/release/community-stable/parrot/docker/Dockerfile
@@ -58,6 +58,8 @@ RUN \
       locales \
       # required to support NTLM for PSRemoting
       gss-ntlmssp \
+      # required for dist-upgrade
+      resolvconf \
     # enable en_US.UTF-8 locale
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
@@ -66,6 +68,8 @@ RUN \
     && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # remove libicu57 package
     && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
+    # upgrade distro
+    && apt-get dist-upgrade -y \
     # install powershell package
     && apt-get install -y /tmp/powershell.deb \
     # remove powershell package
@@ -83,8 +87,6 @@ RUN \
             Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
             Start-Sleep -Seconds 6 ; \
           }" \
-    # upgrade distro
-    && apt-get dist-upgrade -y \
     # clean downloaded packages
     && apt-get clean \
     # remove package list
diff --git a/release/community-stable/parrot/getLatestTag.ps1 b/release/community-stable/parrot/getLatestTag.ps1
index db4bd1568..19d233df0 100644
--- a/release/community-stable/parrot/getLatestTag.ps1
+++ b/release/community-stable/parrot/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the parrot image on
 
 # The versions of parrot we care about
-$shortTags = @('latest')
+$shortTags = @('4')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "parrotsec/parrot-core" -FullTagFilter '^4\..*$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "parrotsec/parrot-core" -FullTagFilter '^4\..*$'
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 6766e31c6..96c9ee25e 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -135,7 +135,7 @@ jobs:
     stable: false
     preview: false
     communityStable: true
-    continueonerror: false
+    continueonerror: true
 
 - template: .vsts-ci/phase.yml
   parameters:

From 0e87dd5dd5632b2f4ef76f844319a140dd670882 Mon Sep 17 00:00:00 2001
From: Ted B <lantrix@pobox.com>
Date: Fri, 25 Oct 2019 16:29:24 +1100
Subject: [PATCH 015/354] MCR is the defacto source for images (#303)

* MCR is the defacto source

As seen on the docker hub Powershell page and as per https://techcommunity.microsoft.com/t5/Containers/Windows-Server-2019-Now-Available/ba-p/382430
Otherwise this doesn't align with all the other doco.

* Updated Dockerhub readme examples link
---
 README.md                   | 8 ++++----
 assets/README.powershell.md | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 73c6f705a..3607aa3af 100644
--- a/README.md
+++ b/README.md
@@ -32,9 +32,9 @@ The Dockerfiles in the community folder were contributed by the community and ar
 To run PowerShell from using a container:
 
 ```sh
-$ docker run -it microsoft/powershell
-Unable to find image 'microsoft/powershell:latest' locally
-latest: Pulling from microsoft/powershell
+$ docker run -it mcr.microsoft.com/powershell
+Unable to find image 'mcr.microsoft.com/powershell:latest' locally
+latest: Pulling from mcr.microsoft.com/powershell
 cad964aed91d: Already exists
 3a80a22fea63: Already exists
 50de990d7957: Already exists
@@ -44,7 +44,7 @@ adf6ad28fa0e: Pull complete
 10db13a8ca02: Pull complete
 75bdb54ff5ae: Pull complete
 Digest: sha256:92c79c5fcdaf3027626643aef556344b8b4cbdaccf8443f543303319949c7f3a
-Status: Downloaded newer image for microsoft/powershell:latest
+Status: Downloaded newer image for mcr.microsoft.com/powershell:latest
 PowerShell
 Copyright (c) Microsoft Corporation. All rights reserved.
 
diff --git a/assets/README.powershell.md b/assets/README.powershell.md
index 099faa4ed..c4b533ec6 100644
--- a/assets/README.powershell.md
+++ b/assets/README.powershell.md
@@ -27,11 +27,11 @@ If you are new to PowerShell and want to learn more, see the [getting started][]
 
 ## How to Use This Image
 
-See our [Docker examples](https://github.com/PowerShell/PowerShell/tree/master/docker#examples).
+See our [Docker examples](https://github.com/PowerShell/PowerShell-Docker#examples).
 
 ## Configuration
 
-See our [Docker examples](https://github.com/PowerShell/PowerShell/tree/master/docker#examples).
+See our [Docker examples](https://github.com/PowerShell/PowerShell-Docker#examples).
 
 ## Full Tag Listing
 

From f77cf5c11e44b2ee5490d67fde376520df99d646 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Tue, 29 Oct 2019 02:32:37 +0800
Subject: [PATCH 016/354] Add NTLM remoting to ArchLinux using multi-stage
 builds (#291)

---
 .../archlinux/docker/Dockerfile               | 41 +++++++++++++++++++
 release/community-stable/archlinux/meta.json  |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index cb047cf45..636d5162d 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -10,6 +10,45 @@ ARG imageRepo=archlinux/base
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
+RUN \
+    # create a builduser
+    useradd builduser -m \
+    # delete the builduser password
+    && passwd -d builduser \
+    # enable builduser to sudo without password
+    && printf 'root ALL=(ALL) ALL\n' | tee -a /etc/sudoers \
+    # update package database
+    && pacman -Syy \
+    # install dependencies
+    && pacman -S --noconfirm \
+      # required sudo
+      sudo \
+      # required for uncompressing tar files
+      tar \
+      # required to clone gss-ntlmssp git repository
+      git \
+      # required to make gss-ntlmssp binary package
+      base-devel \
+      libwbclient \
+      docbook-xsl \
+      doxygen \
+    # change current root path to tmp directory path
+    && cd /tmp \
+    # clone the gss-ntlmssp package repository
+    && git clone https://aur.archlinux.org/gss-ntlmssp.git \
+    # change the cloned gss-ntlmssp package repository directory permission
+    && chmod 777 /tmp/gss-ntlmssp/ \
+    # change current path to gss-ntlmssp package repository folder path
+    && cd gss-ntlmssp \
+    # utilise sudo to builduser in order to make the gss-ntlmssp package
+    && sudo -u builduser bash -c makepkg -s --noconfirm
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
+
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
@@ -53,6 +92,8 @@ RUN \
       openssl-1.0 \
       # required for uncompressing tar files
       tar \
+    # install gss-ntlmssp package from the previous stage
+    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # uncompress powershell linux tar file
diff --git a/release/community-stable/archlinux/meta.json b/release/community-stable/archlinux/meta.json
index 8c0f59deb..8e834dff2 100644
--- a/release/community-stable/archlinux/meta.json
+++ b/release/community-stable/archlinux/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "SkipGssNtlmSspTests": true,
+    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-archlinux-#tag#",
         "archlinux-#shorttag#"

From 5baeb1a8ce8c57c833df5b5cbebc8588788efe41 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Tue, 29 Oct 2019 02:47:36 +0800
Subject: [PATCH 017/354] Add NTLM remoting to AmazonLinux (#298)

* Update to latest and Fix epel-release and gssntlmssp installation

* set gssntlmssptest from true to false

* Update to use latest image tag

* fix whitespace issue

* fix more invisible whitespace issue
---
 .../amazonlinux/docker/Dockerfile                 | 15 +++++++++------
 .../community-stable/amazonlinux/getLatestTag.ps1 |  4 ++--
 release/community-stable/amazonlinux/meta.json    |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 5677a61da..2d3320f8f 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -5,13 +5,13 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=2.0.20181010
+ARG fromTag=latest
 ARG imageRepo=amazonlinux
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -31,14 +31,17 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AmazonLinux-${fromTag}
 
 # Installation
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
+RUN \
+    # download PowerShell rpm package
+    curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
+    # install EPEL repository
+    && yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     # install dependencies
     && yum install -y \
 	    # required for help in PowerShell
 	    less \
-	    # NTLM remoting
-	    epel-release \
-            gssntlmssp \
+	    # install gssntlmssp package from EPEL repository
+	    gssntlmssp \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
     # remove powershell package
diff --git a/release/community-stable/amazonlinux/getLatestTag.ps1 b/release/community-stable/amazonlinux/getLatestTag.ps1
index 498130431..9b8dd9524 100644
--- a/release/community-stable/amazonlinux/getLatestTag.ps1
+++ b/release/community-stable/amazonlinux/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the amazon linux image on
 
 # The versions of amazon linux we care about
-$shortTags = @('2.0')
+$shortTags = @('latest')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "amazonlinux" -FullTagFilter '^2\.0\.\d{8}(\.\d*)?$'
+Get-DockerTags -ShortTags $shortTags -Image "amazonlinux" -FullTagFilter '^latest$'
diff --git a/release/community-stable/amazonlinux/meta.json b/release/community-stable/amazonlinux/meta.json
index 91f41b583..d97bbe4e1 100644
--- a/release/community-stable/amazonlinux/meta.json
+++ b/release/community-stable/amazonlinux/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
+    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-amazonlinux-#tag#",
         "amazonlinux-#shorttag#"

From 72cd90bef6b40b7a0b0d0e24a0eab0d395606faf Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Mon, 28 Oct 2019 17:16:12 -0400
Subject: [PATCH 018/354] Debian bullseye image (#308)

---
 .dependabot/config.yml                        |   4 +
 .gitpod.Dockerfile                            |   5 +
 .gitpod.yml                                   |   2 +
 build.ps1                                     |   2 +-
 .../preview/debian11/dependabot/Dockerfile    |   6 +
 release/preview/debian11/docker/Dockerfile    | 110 ++++++++++++++++++
 release/preview/debian11/getLatestTag.ps1     |  14 +++
 release/preview/debian11/meta.json            |  16 +++
 .../debian11/test-deps/docker/Dockerfile      |  43 +++++++
 release/preview/debian11/test-deps/meta.json  |  16 +++
 vsts-ci.yml                                   |   7 ++
 11 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 .gitpod.Dockerfile
 create mode 100644 .gitpod.yml
 mode change 100644 => 100755 build.ps1
 create mode 100644 release/preview/debian11/dependabot/Dockerfile
 create mode 100644 release/preview/debian11/docker/Dockerfile
 create mode 100644 release/preview/debian11/getLatestTag.ps1
 create mode 100644 release/preview/debian11/meta.json
 create mode 100644 release/preview/debian11/test-deps/docker/Dockerfile
 create mode 100644 release/preview/debian11/test-deps/meta.json

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index fc8e973a2..08644e6f5 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -15,6 +15,10 @@ update_configs:
     directory: "/release/preview/debian10/dependabot"
     update_schedule: "daily"
 
+  - package_manager: "docker"
+    directory: "/release/preview/debian11/dependabot"
+    update_schedule: "daily"
+
   - package_manager: "docker"
     directory: "/release/preview/fedora/dependabot"
     update_schedule: "daily"
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 000000000..b8056ca2e
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/powershell:latest
+
+USER root
+
+RUN apt-get install docker && pwsh -NoLogo -NoProfile -c "install-module -Name Pester -Scope CurrentUser"
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..527c76d39
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,2 @@
+image:
+  file: .gitpod.Dockerfile
diff --git a/build.ps1 b/build.ps1
old mode 100644
new mode 100755
index 823ab25d5..1ed197933
--- a/build.ps1
+++ b/build.ps1
@@ -1,3 +1,4 @@
+#!/usr/bin/pwsh
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
@@ -251,7 +252,6 @@ End {
             }
             else
             {
-
                 $toBuild += $allMeta
                 if($allMeta.Meta.SubImage)
                 {
diff --git a/release/preview/debian11/dependabot/Dockerfile b/release/preview/debian11/dependabot/Dockerfile
new file mode 100644
index 000000000..8a60bc3b0
--- /dev/null
+++ b/release/preview/debian11/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM debian:11
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
new file mode 100644
index 000000000..b034005fe
--- /dev/null
+++ b/release/preview/debian11/docker/Dockerfile
@@ -0,0 +1,110 @@
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=bullseye-slim
+ARG imageRepo=debian
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.1.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG PS_VERSION=6.2.0-preview.3
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/debian11/getLatestTag.ps1 b/release/preview/debian11/getLatestTag.ps1
new file mode 100644
index 000000000..f19797bb9
--- /dev/null
+++ b/release/preview/debian11/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('bullseye-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
new file mode 100644
index 000000000..76d23415b
--- /dev/null
+++ b/release/preview/debian11/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 11 (Testing)",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#tag#",
+        "preview-debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/preview/debian11/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..9bd7c2fe2
--- /dev/null
+++ b/release/preview/debian11/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
+ARG PS_VERSION=6.2.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/debian11/test-deps/meta.json b/release/preview/debian11/test-deps/meta.json
new file mode 100644
index 000000000..568f4e2b2
--- /dev/null
+++ b/release/preview/debian11/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 11 (Testing)",
+    "tagTemplates": [
+        "preview-debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 96c9ee25e..6bf041fe3 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -101,6 +101,13 @@ jobs:
     stable: false
     preview: true
 
+- template: .vsts-ci/phase.yml
+  parameters:
+    name: debian11
+    imagename: debian11
+    stable: false
+    preview: true
+
 - template: .vsts-ci/phase.yml
   parameters:
     name: kaliRolling

From c39802135b63259d3c29be63c4372731cea719d1 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Wed, 30 Oct 2019 13:07:08 -0400
Subject: [PATCH 019/354] Create SECURITY.md (#310)

---
 docs/SECURITY.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 docs/SECURITY.md

diff --git a/docs/SECURITY.md b/docs/SECURITY.md
new file mode 100644
index 000000000..13e0b1705
--- /dev/null
+++ b/docs/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+These versions are currently being supported with security updates:
+
+| Version            | Supported           |
+| ------------------ | ------------------- |
+| Stable             | :white_check_mark:  |
+| Community Stable   | :white_check_mark:  |
+| Preview            | :white_check_mark:  |
+| Servicing          | Critical Isses Only |
+
+## Reporting a Vulnerability
+
+If you have found a potential security issue in PowerShell Core
+or any Docker images present in this repository,
+please email details to secure@microsoft.com.

From 88af8e8708517e3a564564089b0b89fd5a56ca34 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 30 Oct 2019 12:00:45 -0700
Subject: [PATCH 020/354] Fix GitPod (#309)

---
 .gitpod.Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index b8056ca2e..de7746bbe 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -2,4 +2,6 @@ FROM mcr.microsoft.com/powershell:latest
 
 USER root
 
-RUN apt-get install docker && pwsh -NoLogo -NoProfile -c "install-module -Name Pester -Scope CurrentUser"
+RUN apt-get update \
+    && apt-get --yes install docker \
+    && pwsh -NoLogo -NoProfile -c "install-module -Name Pester -Scope CurrentUser -force" 

From 19fae92c20340be39e0887d7476a422260693cd2 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 30 Oct 2019 14:37:14 -0700
Subject: [PATCH 021/354] Add retry for retrieving tag list (#315)

---
 .vsts-ci/phase.yml                     | 16 ++++++++--------
 .vsts-ci/releasePhase.yml              | 22 +++++++++++-----------
 tools/getDockerTags/getDockerTags.psm1 |  3 ++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 3020940fd..faa085bfe 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -20,47 +20,47 @@ jobs:
   pool:
     vmImage: ${{ parameters.vmImage }}
   steps:
-  - powershell: Install-module pester -Scope CurrentUser -Force
+  - pwsh: Install-module pester -Scope CurrentUser -Force
     displayName: Install Pester
     condition: succeededOrFailed()
 
   - ${{ if eq(parameters.stable, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
       displayName: $(ImageName) Stable
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
   - ${{ if eq(parameters.preview, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
       displayName: $(ImageName) Preview
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
   - ${{ if eq(parameters.servicing, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
       displayName: $(ImageName) Servicing
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
   - ${{ if eq(parameters.communityStable, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
       displayName: $(ImageName) Stable
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
   - ${{ if eq(parameters.communityPreview, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
       displayName: $(ImageName) Preview
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
   - ${{ if eq(parameters.communityServicing, 'true') }}:
-    - powershell: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
+    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
       displayName: $(ImageName) Servicing
       condition: succeededOrFailed()
       continueOnError: ${{ parameters.continueonerror }}
 
-  - powershell: |
+  - pwsh: |
       $files = @(Get-ChildItem -Recurse test*.xml)
       if($files.count -eq 0) {
         throw 'no test results found'
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 13ac04f33..d4572cf1c 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -19,41 +19,41 @@ jobs:
   displayName: ${{ parameters.jobName }}
 
   steps:
-  - powershell: |
+  - pwsh: |
       Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
     displayName: 'Enable ACR'
     condition: ne(variables['ACR'], 'no')
 
-  - powershell: |
+  - pwsh: |
       $version = '$(releaseTag)' -replace '^v', ''
       Write-Host "##vso[task.setvariable variable=Version;]$version"
     displayName: 'Set Version'
 
-  - powershell: |
+  - pwsh: |
       $namespace = '$(releaseTag)'.ToLowerInvariant()
       Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
     displayName: 'Set dockerNamespace'
 
-  - powershell: 'Get-ChildItem env:'
+  - pwsh: 'Get-ChildItem env:'
     displayName: 'Capture Environment'
 
-  - powershell: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
+  - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
     displayName: 'docker login'
 
-  - powershell: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+  - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
     displayName: 'az login'
 
-  - powershell: |
+  - pwsh: |
       az account set --subscription $(StorageSubscriptionName)
       $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(2).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
       $url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
       Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
 
-  - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+  - pwsh: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
     displayName: 'Install Pester'
 
-  - powershell: |
+  - pwsh: |
       az account set --subscription $(AcrSubscriptionName)
       $extraParams = @{}
       if($env:ACR -eq 'no')
@@ -83,11 +83,11 @@ jobs:
       }
     displayName: 'Build All $(Channel)'
 
-  - powershell: 'docker logout $(dockerHost)'
+  - pwsh: 'docker logout $(dockerHost)'
     displayName: 'docker logout'
     condition: always()
 
-  - powershell: 'az logout'
+  - pwsh: 'az logout'
     displayName: 'az logout'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index 65d82936b..a48ddff10 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+#Requires -Version 6.2
 # function to deal with pagination
 # which does not happen according to spec'ed behavior
 function Get-DockerTagsList
@@ -17,7 +18,7 @@ function Get-DockerTagsList
         $nextUrl = $Url
         while($nextUrl)
         {
-            $results = Invoke-RestMethod $nextUrl
+            $results = Invoke-RestMethod $nextUrl -MaximumRetryCount 5 -RetryIntervalSec 12
             if($results.results)
             {
                 $results.results.$PropertyName | ForEach-Object {Write-Output $_}

From 07104f5d711981cf2a9c0e8547b90ceeef73c15a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 31 Oct 2019 12:00:29 -0700
Subject: [PATCH 022/354] Sync readme with MCR (#305)

* Sync readme with MCR

* Update README.powershell.md
---
 assets/README.powershell.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/README.powershell.md b/assets/README.powershell.md
index c4b533ec6..29602e408 100644
--- a/assets/README.powershell.md
+++ b/assets/README.powershell.md
@@ -33,6 +33,11 @@ See our [Docker examples](https://github.com/PowerShell/PowerShell-Docker#exampl
 
 See our [Docker examples](https://github.com/PowerShell/PowerShell-Docker#examples).
 
+## Related Repos
+
+- [PowerShell-test-deps](https://store.docker.com/images/microsoft-powershell-test-deps/):
+  PowerShell with Test Dependencies
+
 ## Full Tag Listing
 
 Tags go here.
@@ -43,8 +48,10 @@ For our support policy, see [PowerShell Core Support Lifecycle](https://docs.mic
 
 ## Feedback
 
-- To give feedback for PowerShell Core, file an issue at [PowerShell/Powershell](https://github.com/PowerShell/PowerShell/issues/new/choose)
-- To give feedback for how the images are built, file an issue at [PowerShell/PowerShell-Docker](https://github.com/PowerShell/PowerShell-Docker/issues/new/choose)
+- To give feedback for PowerShell Core,
+  file an issue at [PowerShell/Powershell](https://github.com/PowerShell/PowerShell/issues/new/choose)
+- To give feedback for how the images are built,
+  file an issue at [PowerShell/PowerShell-Docker](https://github.com/PowerShell/PowerShell-Docker/issues/new/choose)
 
 ## License
 

From e10e5006545b1dc9d8485156b780fc34a2f1292e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 31 Oct 2019 12:01:29 -0700
Subject: [PATCH 023/354] Add preview ARM docker file (#301)

---
 .vsts-ci/phase.yml                        |  15 +++
 .vsts-ci/releasePhase.yml                 |   1 -
 .vsts-ci/vsts-arm-ci.yml                  |  36 +++++++
 release/preview/arm32v7/docker/Dockerfile |  95 ++++++++++++++++++
 release/preview/arm32v7/getLatestTag.ps1  |  14 +++
 release/preview/arm32v7/meta.json         |  17 ++++
 tests/container.tests.ps1                 | 115 +++++++++++++++++++---
 tests/containerTestCommon.psm1            |  11 ++-
 tools/buildHelper/buildHelper.psm1        |   5 +
 9 files changed, 291 insertions(+), 18 deletions(-)
 create mode 100644 .vsts-ci/vsts-arm-ci.yml
 create mode 100644 release/preview/arm32v7/docker/Dockerfile
 create mode 100644 release/preview/arm32v7/getLatestTag.ps1
 create mode 100644 release/preview/arm32v7/meta.json

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index faa085bfe..acfa2da85 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -10,6 +10,7 @@ parameters:
   communityServicing: 'false'
   continueonerror: false
   ciParameter: '-CI'
+  useacr: 'false'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -20,6 +21,20 @@ jobs:
   pool:
     vmImage: ${{ parameters.vmImage }}
   steps:
+  - ${{ if eq(parameters.useacr, 'true') }}:
+    - pwsh: |
+        Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
+      displayName: 'Enable ACR'
+      condition: ne(variables['ACR'], 'no')
+
+  - ${{ if eq(parameters.useacr, 'true') }}:
+    - pwsh: 'Get-ChildItem env:'
+      displayName: 'Capture Environment'
+
+  - ${{ if eq(parameters.useacr, 'true') }}:
+    - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+      displayName: 'az login'
+
   - pwsh: Install-module pester -Scope CurrentUser -Force
     displayName: Install Pester
     condition: succeededOrFailed()
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index d4572cf1c..14b8c46b5 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -22,7 +22,6 @@ jobs:
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
     displayName: 'Enable ACR'
-    condition: ne(variables['ACR'], 'no')
 
   - pwsh: |
       $version = '$(releaseTag)' -replace '^v', ''
diff --git a/.vsts-ci/vsts-arm-ci.yml b/.vsts-ci/vsts-arm-ci.yml
new file mode 100644
index 000000000..8b44e203d
--- /dev/null
+++ b/.vsts-ci/vsts-arm-ci.yml
@@ -0,0 +1,36 @@
+name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
+
+resources:
+- repo: self
+  clean: true
+
+variables:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+jobs:
+
+- job: Set_Build_Name
+  pool:
+    vmImage: ubuntu-16.04
+  displayName: Set Build Name
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+  steps:
+  - pwsh:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+    displayName: Set Build Name for Non-PR
+    condition: ne(variables['Build.Reason'], 'PullRequest')
+
+- template: phase.yml
+  parameters:
+    name: arm32v7
+    imagename: arm32v7
+    stable: false
+    preview: true
+    useacr: true
+
+- template: phase.yml
+  parameters:
+    name: centos7
+    imagename: centos7
+    stable: false
+    preview: true
+    useacr: true
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..d86b97763
--- /dev/null
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+ARG fromTag=bionic
+ARG imageRepo=arm32v7/ubuntu
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=6.2.3
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM ${imageRepo}:${fromTag} AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=6.2.3
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-arm32v7-ubuntu-bionic
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/arm32v7/getLatestTag.ps1 b/release/preview/arm32v7/getLatestTag.ps1
new file mode 100644
index 000000000..f4574e134
--- /dev/null
+++ b/release/preview/arm32v7/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the CentOS image on Docker
+
+# The versions of CentOS we care about
+$shortTags = @('bionic')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/preview/arm32v7/meta.json b/release/preview/arm32v7/meta.json
new file mode 100644
index 000000000..3ba1260ef
--- /dev/null
+++ b/release/preview/arm32v7/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 18.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "#psversion#-arm32v7-ubuntu-#tag#",
+        "preview-arm32v7-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    }
+}
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 9fabc8a56..7d1949579 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -22,11 +22,12 @@ Describe "Build Linux Containers" -Tags 'Build', 'Linux' {
                 Path = $_.Path
                 BuildArgs = $_.BuildArgs
                 SkipPull = $_.SkipPull
+                UseAcr = [bool]$_.UseAcr
             }
         }
     }
 
-    it "<Name> builds from '<path>'" -TestCases $buildTestCases -Skip:$script:skipLinux {
+    it "<Name> builds from '<path>' - UseAcr:<UseAcr>" -TestCases $buildTestCases -Skip:$script:skipLinux {
         param(
             [Parameter(Mandatory=$true)]
             [string]
@@ -45,10 +46,13 @@ Describe "Build Linux Containers" -Tags 'Build', 'Linux' {
             $BuildArgs,
 
             [bool]
-            $SkipPull
+            $SkipPull,
+
+            [bool]
+            $UseAcr
         )
 
-        Invoke-DockerBuild -Tags $Tags -Path $Path -BuildArgs $BuildArgs -OSType linux -SkipPull:$SkipPull
+        Invoke-DockerBuild -Tags $Tags -Path $Path -BuildArgs $BuildArgs -OSType linux -SkipPull:$SkipPull -UseAcr:$UseAcr
     }
 }
 
@@ -88,7 +92,7 @@ Describe "Build Windows Containers" -Tags 'Build', 'Windows' {
             $SkipPull
         )
 
-        Invoke-DockerBuild -Tags $Tags -Path $Path -BuildArgs $BuildArgs -OSType windows -SkipPull:$SkipPull
+        Invoke-DockerBuild -Tags $Tags -Path $Path -BuildArgs $BuildArgs -OSType windows -SkipPull:$SkipPull -UseAcr
     }
 }
 
@@ -156,24 +160,30 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
         $testContext = Get-TestContext -type Linux
         $runTestCases = @()
         $script:linuxContainerRunTests | ForEach-Object {
+            $Arm32 = [bool] $_.TestProperties.Arm32
             $runTestCases += @{
                 Name = $_.Name
                 ExpectedVersion = $_.ExpectedVersion
                 Channel = $_.Channel
+                Arm32 = $Arm32
             }
         }
 
         $webTestCases = @()
         $script:linuxContainerRunTests | Where-Object {$_.SkipWebCmdletTests -ne $true} | ForEach-Object {
+            $Arm32 = [bool] $_.TestProperties.Arm32
             $webTestCases += @{
                 Name = $_.Name
+                Arm32 = $Arm32
             }
         }
 
         $gssNtlmSspTestCases = @()
         $script:linuxContainerRunTests | Where-Object {$_.SkipGssNtlmSspTests -ne $true} | ForEach-Object {
+            $Arm32 = [bool] $_.TestProperties.Arm32
             $gssNtlmSspTestCases += @{
                 Name = $_.Name
+                Arm32 = $Arm32
             }
         }
     }
@@ -200,9 +210,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
 
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $actualVersion = Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name
             $actualVersion | should -be $ExpectedVersion
         }
@@ -211,9 +229,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
-                $name
+                $name,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $metadataString = Get-MetadataUsingContainer -Name $Name
             $metadataString | Should -Not -BeNullOrEmpty
             $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
@@ -232,9 +258,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
 
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $culture = Get-UICultureUsingContainer -Name $Name
             $culture | Should -Not -BeNullOrEmpty
             $culture | Should -BeExactly 'en-US'
@@ -244,9 +278,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
-                $name
+                $name,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $gssNtlmSspPath = Get-LinuxGssNtlmSsp -Name $Name
             $gssNtlmSspPath | Should -Not -BeNullOrEmpty
         }
@@ -263,9 +305,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
 
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             if ($Channel -ne 'preview') {
                 Set-ItResult -Skipped -Because "Test is not applicable to $Channel"
             }
@@ -285,18 +335,21 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                     # The expected value is the version, but replace - or ~ with the regex for - or ~
                     ExpectedValue = $_.ExpectedVersion  -replace '[\-~]', '[\-~]'
                     Expectation = 'Match'
+                    UseAcr = [bool]$_.UseAcr
                 }
                 $labelTestCases += @{
                     Name = $_.Name
                     Label = 'org.label-schema.vcs-ref'
                     ExpectedValue = '[0-9a-f]{7}'
                     Expectation = 'match'
+                    UseAcr = [bool]$_.UseAcr
                 }
                 $labelTestCases += @{
                     Name = $_.Name
                     Label = 'org.label-schema.docker.cmd.devel'
                     ExpectedValue = "docker run $($_.ImageName)"
                     Expectation = 'BeExactly'
+                    UseAcr = [bool]$_.UseAcr
                 }
             }
 
@@ -327,9 +380,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 [Parameter(Mandatory=$true)]
                 [ValidateSet('Match','BeExactly')]
                 [string]
-                $Expectation
+                $Expectation,
+
+                [switch]
+                $UseAcr
             )
 
+            if($env:ACR_NAME -and $UseAcr.IsPresent)
+            {
+                Set-ItResult -Pending -Because "Image is missing when building using ACR"
+            }
+
             $labelValue = Get-DockerImageLabel -Name $Name -Label $Label
             $labelValue | Should -Not -BeNullOrEmpty
 
@@ -353,9 +414,11 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
 
             $permissionsTestCases = @(
                 $script:linuxContainerRunTests | ForEach-Object {
+                    $Arm32 = [bool] $_.TestProperties.Arm32
                     @{
                         Name = $_.Name
                         Channel = $_.Channel
+                        Arm32 = $Arm32
                     }
                 }
             )
@@ -367,9 +430,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 [string]
                 $name,
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $path = '/opt/microsoft/powershell/6/pwsh'
 
             if($Channel -eq 'preview')
@@ -386,9 +457,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 [string]
                 $name,
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $path = '/opt/microsoft/powershell/6/pwsh'
 
             if($Channel -eq 'preview')
@@ -412,12 +491,14 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
 
             $testdepsTestCases = @()
             $script:linuxContainerRunTests | ForEach-Object {
+                $Arm32 = [bool] $_.TestProperties.Arm32
                 $name = $_.Name
                 foreach($command in $commands)
                 {
                     $testdepsTestCases += @{
                         Name = $name
                         Command = $command
+                        Arm32 = $Arm32
                     }
                 }
             }
@@ -431,9 +512,17 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 $name,
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Command
+                $Command,
+
+                [Bool]
+                $Arm32
             )
 
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
             $source = Get-DockerCommandSource -Name $name -command $Command
             $source | Should -Not -BeNullOrEmpty
         }
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 631800ef7..753e8bddc 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -143,6 +143,7 @@ function Get-LinuxContainer
                 OptionalTests = $testArgs.OptionalTests
                 TestProperties = $testArgs.TestProperties
                 Channel = $testArgs.Channel
+                UseAcr = $testArgs.UseAcr
             }
         }
     }
@@ -506,16 +507,18 @@ function Invoke-DockerBuild
         $OSType,
 
         [switch]
-        $SkipPull
-    )
+        $SkipPull,
 
+        [switch]
+        $UseAcr
+    )
 
     $buildArgNames = $BuildArgs | Get-Member -Type NoteProperty | Select-Object -ExpandProperty Name
 
     $buildArgList = @()
 
     $extraParams = @{}
-    if($env:ACR_NAME)
+    if($env:ACR_NAME -and $UseAcr.IsPresent)
     {
         $extraParams.Add('UseAcr',$true)
         $buildArgList += @(
@@ -537,7 +540,7 @@ function Invoke-DockerBuild
     foreach($argName in $buildArgNames)
     {
         $value = $BuildArgs.$argName
-        if($env:ACR_NAME -and $value -match '&')
+        if($UseAcr.IsPresent -and $env:ACR_NAME -and $value -match '&')
         {
             throw "$argName contains '&' and this is not allowed in ACR using the az cli"
         }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 800cb6e49..b2277cee5 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -165,6 +165,9 @@ class DockerImageMetaData {
 
     [PSCustomObject]
     $TagMapping
+
+    [bool]
+    $UseAcr = $false
 }
 
 class ShortTagMetaData {
@@ -519,6 +522,7 @@ class DockerTestArgs
     [string[]] $OptionalTests
     [PSCustomObject] $TestProperties
     [string] $Channel
+    [bool] $UseAcr
 }
 
 function Get-TestParams
@@ -648,6 +652,7 @@ function Get-TestParams
         OptionalTests = $allMeta.meta.OptionalTests
         TestProperties = $allMeta.meta.TestProperties
         Channel = $actualChannel
+        UseAcr = $allMeta.meta.UseAcr
     }
 
     return [DockerTestParams] @{

From 859838349f7f49082b2777700e06002e5ff950e4 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Fri, 1 Nov 2019 14:28:13 -0400
Subject: [PATCH 024/354] Install pester if it isn't already installed (#313)

* Install pester if it isn't already installed

* highly intellectual move

* Update vsts-ci.yml

* Update build.ps1

Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>

* I think I fixed it but like I literally don't know powershell

* Update build.ps1

* Update build.ps1

Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>

* renamed the switch

* Update build.ps1

Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>

* hmm

* Update build.ps1

* forgot to get rid of you

* oh huh

* Add it back
---
 .vsts-ci/phase.yml |  2 +-
 build.ps1          | 10 ++++++++--
 vsts-ci.yml        |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index acfa2da85..dec2534c1 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -32,7 +32,7 @@ jobs:
       displayName: 'Capture Environment'
 
   - ${{ if eq(parameters.useacr, 'true') }}:
-    - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+    - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
       displayName: 'az login'
 
   - pwsh: Install-module pester -Scope CurrentUser -Force
diff --git a/build.ps1 b/build.ps1
index 1ed197933..310e45491 100755
--- a/build.ps1
+++ b/build.ps1
@@ -123,7 +123,10 @@ param(
     $ServicingVersion,
 
     [switch]
-    $IncludeKnownIssues
+    $IncludeKnownIssues,
+
+    [switch]
+    $ForcePesterInstall
 )
 
 DynamicParam {
@@ -132,7 +135,6 @@ DynamicParam {
 
     Import-Module $buildHelperPath -Force
 
-
     # Get the names of the builds.
     $releasePath = Join-Path -Path $PSScriptRoot -ChildPath 'release'
 
@@ -409,6 +411,10 @@ End {
             $extraParams.Add('Tags', $tags)
         }
 
+        if(!(Get-Module -ListAvailable pester -ErrorAction Ignore) -or $ForcePesterInstall.IsPresent)
+        {
+            Install-Module -Name pester -Scope CurrentUser -Force
+        }
         Write-Verbose -Message "logging to $logPath" -Verbose
         $results = Invoke-Pester -Script $testsPath -OutputFile $logPath -PassThru -OutputFormat NUnitXml @extraParams
         if(!$results -or $results.FailedCount -gt 0 -or !$results.PassedCount)
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 6bf041fe3..71605dcc1 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -14,7 +14,7 @@ jobs:
     vmImage: ubuntu-16.04
   displayName: Check For Duplicate Tags
   steps:
-  - pwsh:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+  - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
 

From a2d577348042a372d74654443d1b552e54748e34 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sat, 2 Nov 2019 12:35:42 -0400
Subject: [PATCH 025/354] Disabled clearlinux so community build passes for now
 (#317)

---
 tools/buildHelper/buildHelper.psm1 | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index b2277cee5..3e7e2a865 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -62,8 +62,8 @@ function Get-PowerShellVersion
 function Get-ImageList
 {
     param(
-        [Parameter(HelpMessage="Filters returned list to stable or preview images.  Default to all images.")]
-        [ValidateSet('stable','preview','servicing','all','community-stable','community-preview','community-servicing')]
+        [Parameter(HelpMessage="Filters returned list to stable or preview images. Default to all images.")]
+        [ValidateSet('stable','preview','servicing','all','community-stable')]
         [string[]]
         $Channel='all'
     )
@@ -74,8 +74,6 @@ function Get-ImageList
     $previewPath = Join-Path -Path $releasePath -ChildPath 'preview'
     $servicingPath = Join-Path -Path $releasePath -ChildPath 'servicing'
     $communityStablePath = Join-Path -Path $releasePath -ChildPath 'community-stable'
-    $communityPreviewPath = Join-Path -Path $releasePath -ChildPath 'community-preview'
-    $communityServicingPath = Join-Path -Path $releasePath -ChildPath 'community-ervicing'
 
     if ($Channel -in 'stable', 'all')
     {
@@ -94,17 +92,7 @@ function Get-ImageList
 
     if ($Channel -in 'community-stable', 'all')
     {
-        Get-ChildItem -Path $communityStablePath -Directory | Select-Object -ExpandProperty Name | Write-Output
-    }
-
-    if ($Channel -in 'community-servicing', 'all')
-    {
-        Get-ChildItem -Path $communityServicingPath -Directory -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Name | Write-Output
-    }
-
-    if ($Channel -in 'community-preview', 'all')
-    {
-        Get-ChildItem -Path $communityPreviewPath -Directory -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Name | Where-Object { $dockerFileNames -notcontains $_ } | Write-Output
+        Get-ChildItem -Path $communityStablePath -Directory | Select-Object -ExpandProperty Name | Where-Object { $dockerFileNames -notcontains "clearlinux" } | Write-Output
     }
 }
 
@@ -266,8 +254,8 @@ function Add-ParameterAttribute {
 class DockerVersions {
     [string] $WindowsVersion
     [string] $LinuxVersion
-
 }
+
 function Get-Versions
 {
     param(

From b322e952c86b1ae3a139bce6470750ee3c3a36fa Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Mon, 4 Nov 2019 13:27:42 -0500
Subject: [PATCH 026/354] Changed lots of docs (#306)

---
 MAINTAINERS                 | 82 ++++++++++++++++++++++++++++++
 assets/README.powershell.md |  2 +-
 docs/development.md         | 99 ++++++++++++++++++++++++-------------
 3 files changed, 148 insertions(+), 35 deletions(-)
 create mode 100644 MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 000000000..bf8a36252
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,82 @@
+# PowerShell-Docker maintainers file
+# Adapted from Moby's maintainers file
+#
+# This file describes the maintainer groups within the PowerShell/PowerShell-Docker project.
+#
+# It is structured to be consumable by both humans and programs.
+# To extract its contents programmatically, use any TOML-compliant
+# parser.
+#
+[Org]
+
+    [Org."Core maintainers"]
+
+    # The Core maintainers are the ghostbusters of the project: when there's a problem others
+    # can't solve, they show up and fix it with bizarre devices and weaponry.
+    # They have final say on technical implementation and coding style.
+    # They are ultimately responsible for quality in all its forms: usability polish,
+    # bugfixes, performance, stability, etc. When ownership  can cleanly be passed to
+    # a subsystem, they are responsible for doing so and holding the
+    # subsystem maintainers accountable. If ownership is unclear, they are the de facto owners.
+
+    people = [
+        "TravisEz13",
+        "anmenega"
+    ]
+
+    [Org.Curators]
+
+    # The curators help ensure that incoming issues and pull requests are properly triaged and
+    # that our various contribution and reviewing processes are respected. With their knowledge of
+    # the repository activity, they can also guide contributors to relevant material or
+    # discussions.
+    # They are never expected to merge. They can however:
+    # - close an issue or pull request when it's an exact duplicate
+    # - close an issue or pull request when it's inappropriate or off-topic
+    # - make initial reviews for issues such as syntax errors and basic issues in code/docs
+
+    people = [
+        "RDIL"
+    ]
+
+    [Org.Alumni]
+
+    # This list contains maintainers that are no longer active.
+    # It is thanks to these people that the project has become what it is today.
+    # Thank you!
+
+    people = [
+    ]
+
+[people]
+
+# A reference list of all people associated with the project.
+# All other sections should refer to people by their canonical key
+# in the people section.
+
+    # ADD YOURSELF HERE IN ALPHABETICAL ORDER (First name)
+
+    [people.adityapatwardhan]
+        Name = "Aditya Patwardhan"
+        Email = ""
+        GitHub = "adityapatwardhan"
+
+    [people.andrew]
+        Name = "Andrew Menagarishvili"
+        Email = ""
+        GitHub = "anmenaga"
+
+    [people.rdil]
+        Name = "Reece Dunham"
+        Email = "me@rdil.rocks"
+        GitHub = "RDIL"
+
+    [people.kiazhi]
+        Name = "Ryen Tang"
+        Email = "Ryen.Tang@outlook.sg"
+        GitHub = "kiazhi"
+
+    [people.travisez13]
+        Name = "Travis Plunk"
+        Email = "github@ez13.net"
+        GitHub = "TravisEz13"
diff --git a/assets/README.powershell.md b/assets/README.powershell.md
index 29602e408..27e5490ba 100644
--- a/assets/README.powershell.md
+++ b/assets/README.powershell.md
@@ -62,7 +62,7 @@ PowerShell is licensed under the [MIT license][].
 By requesting and using the Container OS image for Windows containers, you acknowledge, understand,
 and consent to the Supplemental License Terms available on Docker Hub:
 
-- [Window Server Core](https://store.docker.com/_/windowsservercore)
+- [Windows Server Core](https://store.docker.com/_/windowsservercore)
 - [Nano Server](https://store.docker.com/_/nanoserver)
 
 [Third-Party Software Notices and Information](https://github.com/PowerShell/PowerShell/blob/master/ThirdPartyNotices.txt)
diff --git a/docs/development.md b/docs/development.md
index c96df92aa..4eaf233e1 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -4,7 +4,7 @@
 
 ### Folder structure
 
-The top level folder with the docker files is `release`.
+The top level folder with the `Dockerfile`s is `release`.
 This should only have folders under it.
 The three folders are:
 
@@ -17,43 +17,17 @@ The name of the folder will be the name of the image in the build system, but do
 For example, the `stable` Ubuntu 16.04 image is in `release/stable/ubuntu16.04`.
 In this folder, there are 4 items:
 
-* `docker` - a folder containing the `Dockerfile` to build the image and any other files needed in the Docker build context
-* `meta.json` - This is required for Linux images.  It should contain the following:
-
-```json
-{
-    "IsLinux" : true,
-    "tagTemplates": [
-        "my-tag",
-        "my-other-tag"
-    ]
-}
-```
-
-Tags are a JSON array that describes the tags the image should have.
-
-Tags you can use:
-  * `#psversion#` is replaced by the version of PowerShell used to build the image.
-  * `#tag#` is replaced by all tags generated by the `getLatestTag.ps1` script.
-  * `#shorttag#` is replaced by short tags generated by the `getLatestTag.ps1` script.
-  * `#longtag#` is replaced by long tags generated by the `getLatestTag.ps1` script.
-
-Example
-
-```json
-"tagTemplates": [
-    "#psversion#-windowsservercore-#tag#",
-    "windowsservercore-#tag#"
-]
-```
-
+* `docker` - A folder containing the `Dockerfile` to build the image and any other files needed in the Docker build context.
+* `test-deps` (official images only) - Directory for a sub-image. See the [`test-deps` image purpose](./index.md#test-dep-images).
+* `dependabot` (optional) - in this directory you can put a dummy `Dockerfile` for [Dependabot](https://dependabot.com) to auto-bump the version. See [Dependabot](#dependabot).
+* `meta.json` - See [this section](#metadata-files) later.
 * `getLatestTag.ps1` - This script should use the `Get-DockerTags` command from `tools\getDockerTags` to get the tags that should be used as the tag in the `FROM` statement in the Dockerfile.
 
-### Dockerfile Standards
+### `Dockerfile` Standards
 
-The Dockerfile should follow certain standards:
+All `Dockerfile`s should follow certain standards:
 
-* The following comments should be applied at the beginning of the dockerfile to all images:
+* The following comments should be applied at the beginning of the `Dockerfile`:
 
   * Copyright notice
   * Software license
@@ -146,3 +120,60 @@ Here is a template for an image build job:
     communityStable: true
     continueonerror: false
 ```
+
+## Tags
+
+Tags are a JSON array that describes the tags the image should have.
+
+### Supported Tags
+
+Tags you can use:
+
+  * `#psversion#` is replaced by the version of PowerShell used to build the image.
+  * `#tag#` is replaced by all tags generated by the `getLatestTag.ps1` script.
+  * `#shorttag#` is replaced by short tags generated by the `getLatestTag.ps1` script.
+
+### Example
+
+```json
+"tagTemplates": [
+    "#psversion#-windowsservercore-#tag#",
+    "windowsservercore-#tag#"
+]
+```
+
+## Metadata Files
+
+This file *is **required*** for all containers. Here is the bare minimum:
+
+```json
+{
+    "IsLinux" : true
+}
+```
+
+You should also add [tags](#tags) as a field.
+
+## Dependabot
+
+This repository has [Dependabot](https://dependabot.com) enabled on it.
+
+The PRs opened for automatic base-image-version bumps will be closed, but the version will most likely get increased.
+
+### Adding to a new Image
+
+You will need to put a `Dockerfile` in the `dependabot` directory of your image, simply containing:
+
+```dockerfile
+FROM my-base-image:1.0.0
+```
+
+You will also need to add an entry in the `/.dependabot/config.yml` file. Here is a template for that:
+
+```yaml
+- package_manager: "docker"
+    directory: "/release/theChannelHere/theImageHere/dependabot"
+    update_schedule: "daily"
+```
+
+> **Do not use `latest` as the base**, as this makes the whole purpose invalid!

From f6c2a4eb2e6f01c1dc816aa2e024a06116b56adc Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 5 Nov 2019 14:39:26 -0800
Subject: [PATCH 027/354] Fix fedora security updating (#322)

---
 release/preview/fedora/docker/Dockerfile | 43 +++++++++++++++++++-----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index 8da7253a8..cce5f153f 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -22,21 +22,48 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && dnf install -y /tmp/powershell.rpm \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
     && dnf install -y \
     # less is needed for help
-    less \
+      less \
     # Needed to run localdef
-        glibc-locale-source \
+      glibc-locale-source \
     # Invoke-WebRequest doesn't work correctly without this
-    compat-openssl10 \
-    ca-certificates \
-    gssntlmssp \
+      compat-openssl10 \
+      ca-certificates \
+      gssntlmssp \
+    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
+    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
+    # to do this, upgrade libmodulemd1, if it is installed
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$module = (dnf list installed libmodulemd1 | Select-String -SimpleMatch libmodulemd1);  \
+          if(\$module) { \
+             dnf upgrade -y libmodulemd1 \
+          }" \
+    # This installs most security advisories
     && dnf upgrade-minimal -y --security \
+    # query and install any remaining security advisories
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          (dnf updateinfo list -q --security) |  \
+              Foreach-Object { \
+                  \$advisory=(\$_ -split ' ')[0]; \
+                  Write-Host '******* Patching *********'; \
+                  Write-Host \$advisory; \
+                  Write-Host '************************'; \
+                  dnf upgrade -y --advisory=\$advisory \
+              }" \
+    && echo "verifying all security advisories are installed..." \
+    && dnf updateinfo list -q --security \
+    && echo "end - verifying all security advisories are installed..." \
     && dnf clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \

From a3eb9d07f4596279d3f9197656148236167ecc48 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 7 Nov 2019 11:13:20 -0800
Subject: [PATCH 028/354] Skip pushing when using ACR (#325)

---
 tests/container.tests.ps1 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 7d1949579..2914f6ade 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -813,6 +813,7 @@ Describe "Push Linux Containers" -Tags 'Linux', 'Push' {
             $pushTestCases += @{
                 Tags = $_.Tags
                 Name = $_.Name
+                UseAcr = [bool]$_.UseAcr
             }
         }
     }
@@ -825,9 +826,17 @@ Describe "Push Linux Containers" -Tags 'Linux', 'Push' {
 
             [Parameter(Mandatory=$true)]
             [string[]]
-            $Tags
+            $Tags,
+
+            [switch]
+            $UseAcr
         )
 
+        if($env:ACR_NAME -and $UseAcr.IsPresent)
+        {
+            Set-ItResult -Pending -Because "Image is missing when building using ACR"
+        }
+
         foreach($tag in $tags) {
             Invoke-Docker -Command push -Params @(
                     ${tag}

From f006a11ad399189994434b9ed870d05e7eb07255 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 7 Nov 2019 14:21:52 -0500
Subject: [PATCH 029/354] Refactoring parts of repo (#318)

---
 .poshchan/settings.json              |  3 +--
 .vsts-ci/misc-analysis.yml           | 21 -------------------
 .vsts-ci/templates/credscan.yml      | 31 ----------------------------
 assets/README.powershellcommunity.md |  4 +++-
 build.ps1                            |  2 +-
 createAllManifests.ps1               |  1 -
 createManifest.ps1                   |  3 +++
 setupVsts.ps1                        | 31 ----------------------------
 tests/container.tests.ps1            | 21 +++++++++----------
 tools/buildHelper/buildHelper.psm1   |  2 +-
 vsts-ci.yml                          | 24 +++++++++++++++++++++
 11 files changed, 43 insertions(+), 100 deletions(-)
 delete mode 100644 .vsts-ci/misc-analysis.yml
 delete mode 100644 .vsts-ci/templates/credscan.yml
 delete mode 100644 setupVsts.ps1

diff --git a/.poshchan/settings.json b/.poshchan/settings.json
index 82cb4ec5c..41abd5b54 100644
--- a/.poshchan/settings.json
+++ b/.poshchan/settings.json
@@ -4,8 +4,7 @@
         "organization": "powershell",
         "project": "docker",
         "build_targets": {
-            "CI": "docker-PR",
-            "secretscan": "Docker-CI-Secret-Scan",
+            "CI": "docker-PR"
         },
         "authorized_users": [
             "SteveL-MSFT",
diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
deleted file mode 100644
index 0392c1f4a..000000000
--- a/.vsts-ci/misc-analysis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
-trigger:
-  # Batch merge builds together while a merge build is running
-  batch: true
-  branches:
-    include:
-    - master
-    - release*
-
-pr:
-  branches:
-    include:
-    - master
-    - release*
-
-resources:
-- repo: self
-  clean: true
-
-jobs:
-- template: templates/credscan.yml
diff --git a/.vsts-ci/templates/credscan.yml b/.vsts-ci/templates/credscan.yml
deleted file mode 100644
index eb711c8e0..000000000
--- a/.vsts-ci/templates/credscan.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  pool: 'Hosted VS2017'
-  jobName: 'credscan'
-  displayName: Secret Scan
-
-jobs:
-- job: ${{ parameters.jobName }}
-  pool:
-    name: ${{ parameters.pool }}
-
-  displayName: ${{ parameters.displayName }}
-
-  steps:
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-    displayName: 'Scan for secrets'
-    inputs:
-      debugMode: false
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-    displayName: 'Publish Secret Scan Logs to Build Artifacts'
-    continueOnError: true
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
-    displayName: 'Check for failures'
-    inputs:
-      CredScan: true
-      ToolLogsNotFoundAction: Error
diff --git a/assets/README.powershellcommunity.md b/assets/README.powershellcommunity.md
index 18dc2cba5..1de347e73 100644
--- a/assets/README.powershellcommunity.md
+++ b/assets/README.powershellcommunity.md
@@ -4,7 +4,9 @@
 
 ## Docker pull command
 
-`docker pull pshorg/powershellcommunity`
+```bash
+$ docker pull pshorg/powershellcommunity
+```
 
 ## Tags
 
diff --git a/build.ps1 b/build.ps1
index 310e45491..84ee661b0 100755
--- a/build.ps1
+++ b/build.ps1
@@ -243,7 +243,7 @@ End {
                 -Strict:$CheckForDuplicateTags.IsPresent
 
             $nameForMessage = Split-Path -Leaf -Path $dockerFileName
-            $message = "Channel: $nameForMessage does not exist.  Not every image exists in every channel.  Skipping."
+            $message = "$nameForMessage does not exist in every channel. Skipping."
             if(!$allMeta)
             {
                 Write-Warning $message
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index 3c070f3ac..bafad6852 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -15,7 +15,6 @@ param (
 
 $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
 
-
 $latestStableUbuntu   = "ubuntu-bionic"
 $latestStableWscLtsc  = "windowsservercore-latest"
 $latestStableWsc1803  = "windowsservercore-1803"
diff --git a/createManifest.ps1 b/createManifest.ps1
index ad205a308..a065259d0 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 # Used to create a container manifest.
 # Prereq: you must login to $ContainerRegistery before running this script
 # default scenarios is to build a `latest` tag which will point to the `ubuntu-16.04` tag for linux
diff --git a/setupVsts.ps1 b/setupVsts.ps1
deleted file mode 100644
index 01e7c8c9d..000000000
--- a/setupVsts.ps1
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Queue Docker image build for a particular image
-# ** Expects to have OAuth access in the build**
-# ** and the build service has to be granted permission to launch builds**
-# The build is expected to have the following parameters:
-#  - fromTag
-#    - The tag of the image in the from statement which is being produced
-#  - imageTag
-#    - The tag of the produced image
-#  - PowerShellVersion
-#    - The version of powershell to put in the image
-#  - Namespace
-#    - `public` to build for public consumption.
-#    - `internal` to build for internal consumption.
-
-param(
-    [Parameter(Mandatory)]
-    [string]
-    $Name,
-    [Parameter(Mandatory)]
-    [int]
-    $BuildDefinitionId,
-    [Parameter(Mandatory)]
-    [ValidateSet('public', 'internal')]
-    [string]
-    $Namespace
-)
-
-&"$PSScriptRoot\build.ps1" -Name $Name -BuildDefinitionId $BuildDefinitionId -Namespace $Namespace -Vsts
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 2914f6ade..690a5267a 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -27,7 +27,7 @@ Describe "Build Linux Containers" -Tags 'Build', 'Linux' {
         }
     }
 
-    it "<Name> builds from '<path>' - UseAcr:<UseAcr>" -TestCases $buildTestCases -Skip:$script:skipLinux {
+    it "can build image <Name> from '<path>' - UseAcr:<UseAcr>" -TestCases $buildTestCases -Skip:$script:skipLinux {
         param(
             [Parameter(Mandatory=$true)]
             [string]
@@ -70,7 +70,7 @@ Describe "Build Windows Containers" -Tags 'Build', 'Windows' {
         }
     }
 
-    it "<Name> builds from '<path>'" -TestCases $buildTestCases -skip:$script:skipWindows {
+    it "can build image <Name> from '<path>'" -TestCases $buildTestCases -skip:$script:skipWindows {
         param(
             [Parameter(Mandatory=$true)]
             [string]
@@ -187,7 +187,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             }
         }
     }
-    AfterAll{
+    AfterAll {
         # prune unused volumes
         $null=Invoke-Docker -Command 'volume', 'prune' -Params '--force' -SuppressHostOutput
     }
@@ -197,8 +197,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
     }
 
     Context "Run Powershell" {
-
-        it "Get PSVersion table from <Name> should be <ExpectedVersion>" -TestCases $runTestCases -Skip:$script:skipLinuxRun {
+        it "PSVersion table from <Name> should contain <ExpectedVersion>" -TestCases $runTestCases -Skip:$script:skipLinuxRun {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
@@ -363,7 +362,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             }
         }
 
-        it "Image <Name> should have label: <Label>, with value: <ExpectedValue>" -TestCases $labelTestCases -Skip:$script:skipLinuxRun {
+        it "Image <Name> should have label <Label> with value: <ExpectedValue>" -TestCases $labelTestCases -Skip:$script:skipLinuxRun {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
@@ -410,8 +409,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
     }
 
     Context "permissions" {
-        BeforeAll{
-
+        BeforeAll {
             $permissionsTestCases = @(
                 $script:linuxContainerRunTests | ForEach-Object {
                     $Arm32 = [bool] $_.TestProperties.Arm32
@@ -451,6 +449,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             $permissions = Get-DockerImagePwshPermissions -Name $name -Path $path
             $permissions | Should -Match '^[\-rw]{3}x([\-rw]{2}x){2}$' -Because 'Everyone should be able to execute'
         }
+
         it "pwsh should NOT have write permissions for others in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
             param(
                 [Parameter(Mandatory=$true)]
@@ -481,7 +480,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
     }
 
     Context "default executables" {
-        BeforeAll{
+        BeforeAll {
             #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps
             $commands = @(
                 #'locale-gen'
@@ -620,7 +619,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
     }
 
     Context "Size" {
-        BeforeAll{
+        BeforeAll {
             $sizeTestCases = @($script:linuxContainerRunTests | ForEach-Object {
                 $size = $_.TestProperties.size
                 @{
@@ -846,7 +845,7 @@ Describe "Push Linux Containers" -Tags 'Linux', 'Push' {
 }
 
 Describe "Push Windows Containers" -Tags 'Windows', 'Push' {
-    BeforeAll{
+    BeforeAll {
         $pushTestCases = @()
         $script:windowsContainerRunTests | ForEach-Object {
             $pushTestCases += @{
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 3e7e2a865..65bc2a214 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-# Gets the Current version of PowerShell from the PowerShell repo
+# Gets the current version of PowerShell from the PowerShell repo
 # or formats the version based on the parameters
 
 function Get-PowerShellVersion
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 71605dcc1..e4e01bb67 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -22,6 +22,30 @@ jobs:
     displayName: Check for Duplicate Tags
     condition: succeededOrFailed()
 
+- job: Secret_Scan
+  pool: 'Hosted VS2017'
+  displayName: Secret Scan
+
+  steps:
+  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
+    displayName: Set Build Name for Non-PR
+    condition: ne(variables['Build.Reason'], 'PullRequest')
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+    displayName: 'Scan for secrets'
+    inputs:
+      debugMode: false
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+    displayName: 'Publish Secret Scan Logs to Build Artifacts'
+    continueOnError: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
+    displayName: 'Check for Failures'
+    inputs:
+      CredScan: true
+      ToolLogsNotFoundAction: Error
+
 - template: .vsts-ci/phase.yml
   parameters:
     name: ubuntu1604

From 88273b793bd4611ab9116b1b821748d2e2e4eab6 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Fri, 8 Nov 2019 14:28:37 -0500
Subject: [PATCH 030/354] Add metadata to skip failing images (#326)

---
 release/community-stable/clearlinux/meta.json |  2 +-
 .../community-stable/kali-rolling/meta.json   |  1 +
 release/community-stable/parrot/meta.json     |  1 +
 tools/buildHelper/buildHelper.psm1            | 22 +++++++++++++------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/release/community-stable/clearlinux/meta.json b/release/community-stable/clearlinux/meta.json
index 62ace397f..510578268 100644
--- a/release/community-stable/clearlinux/meta.json
+++ b/release/community-stable/clearlinux/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
-    "SkipWebCmdletTests": false,
+    "IsBroken": true,
     "tagTemplates": [
         "#psversion#-clearlinux-#tag#",
         "clearlinux-#shorttag#"
diff --git a/release/community-stable/kali-rolling/meta.json b/release/community-stable/kali-rolling/meta.json
index 0e4e70110..cf9db6c00 100644
--- a/release/community-stable/kali-rolling/meta.json
+++ b/release/community-stable/kali-rolling/meta.json
@@ -2,6 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
     "SkipGssNtlmSspTests": false,
+    "IsBroken": true,
     "tagTemplates": [
         "#psversion#-kali-#tag#",
         "kali-#shorttag#"
diff --git a/release/community-stable/parrot/meta.json b/release/community-stable/parrot/meta.json
index 86bfa16ad..5e8f6533c 100644
--- a/release/community-stable/parrot/meta.json
+++ b/release/community-stable/parrot/meta.json
@@ -2,6 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
     "SkipGssNtlmSspTests": false,
+    "IsBroken": true,
     "tagTemplates": [
         "#psversion#-parrot-#tag#",
         "parrot-#shorttag#"
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 65bc2a214..cb6dd12dd 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -92,7 +92,7 @@ function Get-ImageList
 
     if ($Channel -in 'community-stable', 'all')
     {
-        Get-ChildItem -Path $communityStablePath -Directory | Select-Object -ExpandProperty Name | Where-Object { $dockerFileNames -notcontains "clearlinux" } | Write-Output
+        Get-ChildItem -Path $communityStablePath -Directory | Select-Object -ExpandProperty Name | Write-Output
     }
 }
 
@@ -156,6 +156,9 @@ class DockerImageMetaData {
 
     [bool]
     $UseAcr = $false
+    
+    [bool]
+    $IsBroken = $false
 }
 
 class ShortTagMetaData {
@@ -391,6 +394,13 @@ function Get-DockerImageMetaDataWrapper
     }
 
     $meta = Get-DockerImageMetaData -Path $metaJsonPath
+
+    # if the image is broken and we shouldn't include known issues,
+    # do this
+    if(!$IncludeKnownIssues.IsPresent -and $meta.Broken -ne $null) {
+        return
+    }
+
     $tagsTemplates = $meta.tagTemplates
 
     $getTagsExtraParams = @{}
@@ -399,13 +409,10 @@ function Get-DockerImageMetaDataWrapper
     {
         $shortTags = @()
         foreach ($shortTag in $meta.ShortTags) {
-            if(!$shortTag.KnownIssue -or $IncludeKnownIssues.IsPresent)
-            {
-                $shortTags += $shortTag.Tag
-            }
+            $shortTags += $shortTag.Tag
         }
 
-        $getTagsExtraParams.Add('ShortTags',$shortTags)
+        $getTagsExtraParams.Add('ShortTags', $shortTags)
     }
 
     if(!$TagData)
@@ -423,7 +430,8 @@ function Get-DockerImageMetaDataWrapper
             $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
         }
     }
-    elseif ($meta.TagMapping) {
+    elseif ($meta.TagMapping)
+    {
         foreach($regex in $meta.TagMapping.PSObject.Properties.Name)
         {
             if($BaseImage -match $regex)

From 02ecd3c697f2d1c03b679febf782ad0090fa5598 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Fri, 8 Nov 2019 16:29:32 -0500
Subject: [PATCH 031/354] Typo fix (#327)

* Typo fix

* Update SECURITY.md
---
 docs/SECURITY.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 13e0b1705..22c0cac7a 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -4,12 +4,12 @@
 
 These versions are currently being supported with security updates:
 
-| Version            | Supported           |
-| ------------------ | ------------------- |
-| Stable             | :white_check_mark:  |
-| Community Stable   | :white_check_mark:  |
-| Preview            | :white_check_mark:  |
-| Servicing          | Critical Isses Only |
+| Version            | Supported            |
+| ------------------ | -------------------- |
+| Stable             | :white_check_mark:   |
+| Community Stable   | :white_check_mark:   |
+| Preview            | :white_check_mark:   |
+| Servicing          | Critical Issues Only |
 
 ## Reporting a Vulnerability
 

From 5a0d1779e374325d48c7d38933a121569cb2e744 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Tue, 12 Nov 2019 18:27:25 -0500
Subject: [PATCH 032/354] Update PS version for photon (#332)

---
 release/community-stable/photon/docker/Dockerfile | 2 +-
 release/preview/fedora/meta.json                  | 2 +-
 release/preview/fedora/test-deps/meta.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index 436a4da42..c18a6a716 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -11,7 +11,7 @@ ARG imageRepo=photon
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
diff --git a/release/preview/fedora/meta.json b/release/preview/fedora/meta.json
index 17e89619f..9e1c98a74 100644
--- a/release/preview/fedora/meta.json
+++ b/release/preview/fedora/meta.json
@@ -10,6 +10,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 586
+        "size": 632
     }
 }
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
index 0506d5a74..5d7da871c 100644
--- a/release/preview/fedora/test-deps/meta.json
+++ b/release/preview/fedora/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 602
+        "size": 632
     },
     "TagMapping": {
         "^.*-fedora-28$" : "preview-fedora-28",

From cd1790d7f138432abde4f07cf6680ae7c5631660 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 Nov 2019 14:29:51 -0800
Subject: [PATCH 033/354] Create issue_label_bot.yaml

---
 .github/issue_label_bot.yaml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/issue_label_bot.yaml

diff --git a/.github/issue_label_bot.yaml b/.github/issue_label_bot.yaml
new file mode 100644
index 000000000..4374b1996
--- /dev/null
+++ b/.github/issue_label_bot.yaml
@@ -0,0 +1,4 @@
+label-alias:
+  bug: 'Issue-Bug'
+  feature_request: 'Issue-Enhancement'
+  question: 'Issue-Question'

From 626638add57c241d5e1fe7811fb2f938876c739e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Nov 2019 18:03:49 -0800
Subject: [PATCH 034/354] Fix Fedora 28 failure (#340)

---
 release/preview/fedora/docker/Dockerfile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index cce5f153f..81df126b9 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -24,6 +24,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && dnf install -y /tmp/powershell.rpm \
     # remove powershell package
     && rm /tmp/powershell.rpm \
+    && echo "starting misc packages" \
     && dnf install -y \
     # less is needed for help
       less \
@@ -33,24 +34,33 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       compat-openssl10 \
       ca-certificates \
       gssntlmssp \
+    && echo "end - misc packages" \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
+    && echo "starting FEDORA-2019-27e7b92407" \
     # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
     # to do this, upgrade libmodulemd1, if it is installed
     && pwsh \
         -NoLogo \
         -NoProfile \
         -Command " \
-          \$module = (dnf list installed libmodulemd1 | Select-String -SimpleMatch libmodulemd1);  \
+          try { \$packageList = dnf list installed libmodulemd1} \
+          catch {}; \
+          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
           if(\$module) { \
-             dnf upgrade -y libmodulemd1 \
+            Write-Host '******* Patching *********'; \
+            dnf upgrade -y libmodulemd1 \
           }" \
+    && echo "end - FEDORA-2019-27e7b92407" \
     # This installs most security advisories
+    && echo "starting upgrade minimal" \
     && dnf upgrade-minimal -y --security \
+    && echo "end - upgrade minimal" \
     # query and install any remaining security advisories
     && pwsh \
         -NoLogo \
         -NoProfile \
         -Command " \
+          Write-Host '******* Getting security advisory list *********'; \
           (dnf updateinfo list -q --security) |  \
               Foreach-Object { \
                   \$advisory=(\$_ -split ' ')[0]; \

From e8636303debd1c50e5ef98f6f8d0987e66c3322a Mon Sep 17 00:00:00 2001
From: Matthew Lorimor <mattlorimor@gmail.com>
Date: Sat, 4 Jan 2020 14:17:52 -0600
Subject: [PATCH 035/354] Slim down some of the final images (#345)

---
 MAINTAINERS                                     |  5 +++++
 .../archlinux/docker/Dockerfile                 |  5 ++---
 .../blackarch/docker/Dockerfile                 |  5 ++---
 .../kali-rolling/docker/Dockerfile              | 17 +++++++----------
 .../oraclelinux/docker/Dockerfile               |  2 +-
 release/community-stable/oraclelinux/meta.json  |  2 +-
 .../community-stable/parrot/docker/Dockerfile   | 10 ++++------
 .../preview/centos7/test-deps/docker/Dockerfile |  3 ++-
 .../preview/centos8/test-deps/docker/Dockerfile |  3 ++-
 release/preview/debian9/docker/Dockerfile       | 11 ++++++-----
 release/preview/ubuntu16.04/docker/Dockerfile   | 11 ++++++-----
 release/preview/ubuntu18.04/docker/Dockerfile   | 11 ++++++-----
 release/servicing/arm32v7/docker/Dockerfile     |  1 +
 release/servicing/debian9/docker/Dockerfile     | 11 ++++++-----
 release/servicing/ubuntu16.04/docker/Dockerfile | 11 ++++++-----
 release/servicing/ubuntu18.04/docker/Dockerfile | 11 ++++++-----
 release/stable/arm32v7/docker/Dockerfile        |  1 +
 .../stable/centos7/test-deps/docker/Dockerfile  |  3 ++-
 release/stable/debian9/docker/Dockerfile        | 11 ++++++-----
 release/stable/ubuntu16.04/docker/Dockerfile    | 11 ++++++-----
 release/stable/ubuntu18.04/docker/Dockerfile    | 11 ++++++-----
 21 files changed, 84 insertions(+), 72 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index bf8a36252..e40e12408 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -66,6 +66,11 @@
         Email = ""
         GitHub = "anmenaga"
 
+    [people.mattlorimor]
+        Name = "Matthew Lorimor"
+        Email = "mattlorimor@gmail.com"
+        GitHub = "mattlorimor"
+
     [people.rdil]
         Name = "Reece Dunham"
         Email = "me@rdil.rocks"
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index 636d5162d..fb647e3bf 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -55,9 +55,6 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
 
-# Download the PowerShell Core Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.tar.gz
-
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -96,6 +93,8 @@ RUN \
     && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
+    # Pull down the powershell linux tar file
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \ 
     # uncompress powershell linux tar file
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} -v \
     # remove powershell linux tar file
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 7765ef5e2..63e4f1a7c 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -62,9 +62,6 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
 
-# Download the PowerShell Core Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.tar.gz
-
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -111,6 +108,8 @@ RUN \
     && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
+    # Pull down the powershell linux tar file
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \
     # uncompress powershell linux tar file
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} \
     # remove powershell linux tar file
diff --git a/release/community-stable/kali-rolling/docker/Dockerfile b/release/community-stable/kali-rolling/docker/Dockerfile
index b464c16d9..be85e2fdf 100644
--- a/release/community-stable/kali-rolling/docker/Dockerfile
+++ b/release/community-stable/kali-rolling/docker/Dockerfile
@@ -16,21 +16,12 @@ ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
 
-# Download the Debian9 PowerShell Core package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define Args for the needed to add the package
 ARG KALI_REPO_KEY_PACKAGE_URL=https://http.kali.org/kali/pool/main/k/kali-archive-keyring/kali-archive-keyring_2018.2_all.deb
 
-# Download the Kali repository package and save it
-ADD ${KALI_REPO_KEY_PACKAGE_URL} /tmp/kali-archive-keyring_2018.2_all.deb
-
 # Define Args for the needed to add the package
 ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
 
-# Download the libicu57 Debian package and save it
-ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u3_amd64.deb
-
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -49,10 +40,14 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Installation
 RUN \
+    # Download the Kali repository package and save it
+    wget -O /tmp/kali-archive-keyring_2018.2_all.deb --no-check-certificate ${KALI_REPO_KEY_PACKAGE_URL} \
     # install kali package to renew kali repository expired certificate in container image
-    apt-get install /tmp/kali-archive-keyring_2018.2_all.deb \
+    && apt-get install /tmp/kali-archive-keyring_2018.2_all.deb \
     # remove kali package
     && rm -f /tmp/kali-archive-keyring_2018.2_all.deb \
+    # Download the libicu57 Debian package and save it
+    && wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
     # install required libicu57 package
     && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # remove libicu57 package
@@ -75,6 +70,8 @@ RUN \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
     && locale-gen && update-locale \
+    # download the powershell package
+    && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
     # install powershell package
     && apt-get install -y /tmp/powershell.deb \
     # remove powershell package
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 609af9fea..2ec840a7d 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -39,7 +39,7 @@ RUN \
 	    # required for help in powershell
 	    less \
       # install EPEL repository
-	    epel-release \
+	    oracle-epel-release-el7 \
       # install gssntlmssp package from EPEL repository
 	    gssntlmssp \
     # install powershell package
diff --git a/release/community-stable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
index 66b311784..a3b6afc86 100644
--- a/release/community-stable/oraclelinux/meta.json
+++ b/release/community-stable/oraclelinux/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "SkipGssNtlmSspTests": false,
+    "SkipGssNtlmSspTests": true,
     "tagTemplates": [
         "#psversion#-oraclelinux-#tag#",
         "oraclelinux-#shorttag#"
diff --git a/release/community-stable/parrot/docker/Dockerfile b/release/community-stable/parrot/docker/Dockerfile
index 954a2dfc0..d27eca372 100644
--- a/release/community-stable/parrot/docker/Dockerfile
+++ b/release/community-stable/parrot/docker/Dockerfile
@@ -19,15 +19,9 @@ ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
 
-# Download the Debian9 PowerShell Core package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define Args for the needed to add the package
 ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
 
-# Download the libicu57 Debian package and save it
-ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u3_amd64.deb
-
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -64,12 +58,16 @@ RUN \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
     && locale-gen && update-locale \
+    # Download the libicu57 Debian package and save it
+    && wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
     # install required libicu57 package
     && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # remove libicu57 package
     && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # upgrade distro
     && apt-get dist-upgrade -y \
+    # Download the Debian9 PowerShell Core package and save it
+    && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
     # install powershell package
     && apt-get install -y /tmp/powershell.deb \
     # remove powershell package
diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile
index d343eca55..9f1e3728c 100644
--- a/release/preview/centos7/test-deps/docker/Dockerfile
+++ b/release/preview/centos7/test-deps/docker/Dockerfile
@@ -8,7 +8,8 @@ RUN yum install -y \
         sudo \
         wget \
         openssl \
-    && yum clean all
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
index d343eca55..9f1e3728c 100644
--- a/release/preview/centos8/test-deps/docker/Dockerfile
+++ b/release/preview/centos8/test-deps/docker/Dockerfile
@@ -8,7 +8,8 @@ RUN yum install -y \
         sudo \
         wget \
         openssl \
-    && yum clean all
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 93a95ae1b..ede09c34e 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.2.0-preview.3
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -22,8 +18,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -31,6 +28,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 2e4beeca6..fe5360287 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.1.0~rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -22,8 +18,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -31,6 +28,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 295c1eb45..7c0e6ece0 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.1.0~rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -22,8 +18,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -31,6 +28,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/servicing/arm32v7/docker/Dockerfile b/release/servicing/arm32v7/docker/Dockerfile
index a87222f7e..23538f0c1 100644
--- a/release/servicing/arm32v7/docker/Dockerfile
+++ b/release/servicing/arm32v7/docker/Dockerfile
@@ -13,6 +13,7 @@ RUN \
   && wget https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} \
   && mkdir ~/powershell \
   && tar -xvf ./${PS_PACKAGE} -C ~/powershell \
+  && rm -rf ./${PS_PACKAGE} \
   && ln -s /root/powershell/pwsh /usr/bin/pwsh \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index ddaba3d8a..26e9f11dd 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -9,10 +9,6 @@ ARG PS_VERSION=6.1.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -22,8 +18,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -31,6 +28,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index 56beadf00..ac1e14154 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.1.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -21,8 +17,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -30,6 +27,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index 67062b77d..e2f06f337 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.1.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -21,8 +17,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -30,6 +27,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 7e6b6e8f3..d4f77c519 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -13,6 +13,7 @@ RUN \
   && wget https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} \
   && mkdir ~/powershell \
   && tar -xvf ./${PS_PACKAGE} -C ~/powershell \
+  && rm -rf ./${PS_PACKAGE} \
   && ln -s /root/powershell/pwsh /usr/bin/pwsh \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile
index b44beb0a8..a20039945 100644
--- a/release/stable/centos7/test-deps/docker/Dockerfile
+++ b/release/stable/centos7/test-deps/docker/Dockerfile
@@ -8,7 +8,8 @@ RUN yum install -y \
         sudo \
         wget \
         openssl \
-    && yum clean all
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
 # Define args needed only for the labels
 ARG VCS_REF="none"
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 89014a3c8..59b90423c 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -21,8 +17,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -30,6 +27,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index a065e990c..edd1aba94 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -21,8 +17,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -30,6 +27,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index f428c7d04..be0b79883 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -8,10 +8,6 @@ ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-RUN echo ${PS_PACKAGE_URL}
-# Download the Linux package and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -21,8 +17,9 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y /tmp/powershell.deb \
     && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
     # less is required for help in powershell
         less \
     # requied to setup the locale
@@ -30,6 +27,10 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \

From f71706d021d7125b8a24d5f37dddc693f4e6ff4b Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Wed, 8 Jan 2020 14:34:15 -0500
Subject: [PATCH 036/354] Bump PowerShell versions (#349)

---
 release/preview/alpine38/docker/Dockerfile    |  2 +-
 .../alpine38/test-deps/docker/Dockerfile      |  2 +-
 release/preview/alpine39/docker/Dockerfile    |  2 +-
 .../alpine39/test-deps/docker/Dockerfile      |  2 +-
 release/preview/centos7/docker/Dockerfile     |  4 +--
 .../centos7/test-deps/docker/Dockerfile       |  2 +-
 release/preview/centos8/docker/Dockerfile     |  4 +--
 .../centos8/test-deps/docker/Dockerfile       |  2 +-
 release/preview/debian10/docker/Dockerfile    |  2 +-
 .../debian10/test-deps/docker/Dockerfile      |  2 +-
 release/preview/debian11/docker/Dockerfile    |  2 +-
 .../debian11/test-deps/docker/Dockerfile      |  2 +-
 release/preview/debian9/docker/Dockerfile     |  2 +-
 .../debian9/test-deps/docker/Dockerfile       |  2 +-
 release/preview/fedora/docker/Dockerfile      |  4 +--
 .../fedora/test-deps/docker/Dockerfile        |  2 +-
 release/preview/nanoserver/docker/Dockerfile  | 34 +++++++++----------
 .../preview/nanoserver1809/docker/Dockerfile  | 34 +++++++++----------
 release/preview/opensuse423/docker/Dockerfile |  2 +-
 .../opensuse423/test-deps/docker/Dockerfile   |  2 +-
 release/preview/ubuntu16.04/docker/Dockerfile |  2 +-
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +-
 release/preview/ubuntu18.04/docker/Dockerfile |  2 +-
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +-
 .../windowsservercore/docker/Dockerfile       |  2 +-
 25 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/release/preview/alpine38/docker/Dockerfile b/release/preview/alpine38/docker/Dockerfile
index 3d7106c1c..b31b4d5b1 100644
--- a/release/preview/alpine38/docker/Dockerfile
+++ b/release/preview/alpine38/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG imageRepo=alpine
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile
index 6ac5177d3..475dbfdea 100644
--- a/release/preview/alpine38/test-deps/docker/Dockerfile
+++ b/release/preview/alpine38/test-deps/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 45f1a1b20..2be346159 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG imageRepo=alpine
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile
index daf67b708..94637a9f1 100644
--- a/release/preview/alpine39/test-deps/docker/Dockerfile
+++ b/release/preview/alpine39/test-deps/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index cea777d5b..b01b93854 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -4,8 +4,8 @@ ARG imageRepo=centos
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0-preview.2
-ARG PACKAGE_VERSION=6.2.0_preview.2
+ARG PS_VERSION=7.0.0-preview.1
+ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile
index 9f1e3728c..5b9e2fc53 100644
--- a/release/preview/centos7/test-deps/docker/Dockerfile
+++ b/release/preview/centos7/test-deps/docker/Dockerfile
@@ -16,7 +16,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index a69eff4aa..d7fdb6ade 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -4,8 +4,8 @@ ARG imageRepo=centos
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0-preview.2
-ARG PACKAGE_VERSION=6.2.0_preview.2
+ARG PS_VERSION=7.0.0-preview.1
+ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
index 9f1e3728c..5b9e2fc53 100644
--- a/release/preview/centos8/test-deps/docker/Dockerfile
+++ b/release/preview/centos8/test-deps/docker/Dockerfile
@@ -16,7 +16,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 44ee55727..79f5a56e4 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/debian10/test-deps/docker/Dockerfile b/release/preview/debian10/test-deps/docker/Dockerfile
index d309f3fda..64cbaffbb 100644
--- a/release/preview/debian10/test-deps/docker/Dockerfile
+++ b/release/preview/debian10/test-deps/docker/Dockerfile
@@ -20,7 +20,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index b034005fe..a76d8fa5a 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/preview/debian11/test-deps/docker/Dockerfile
index 9bd7c2fe2..647c9ab4b 100644
--- a/release/preview/debian11/test-deps/docker/Dockerfile
+++ b/release/preview/debian11/test-deps/docker/Dockerfile
@@ -20,7 +20,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index ede09c34e..acd2fa935 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=debian
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile
index 7f399e1c9..0abc4fc86 100644
--- a/release/preview/debian9/test-deps/docker/Dockerfile
+++ b/release/preview/debian9/test-deps/docker/Dockerfile
@@ -20,7 +20,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index 81df126b9..fcdf8e19d 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -4,8 +4,8 @@ ARG imageRepo=fedora
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0-preview.2
-ARG PACKAGE_VERSION=6.2.0_preview.2
+ARG PS_VERSION=7.0.0-preview.1
+ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/fedora/test-deps/docker/Dockerfile b/release/preview/fedora/test-deps/docker/Dockerfile
index e6b972d79..e0004d29a 100644
--- a/release/preview/fedora/test-deps/docker/Dockerfile
+++ b/release/preview/fedora/test-deps/docker/Dockerfile
@@ -20,7 +20,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/nanoserver/docker/Dockerfile b/release/preview/nanoserver/docker/Dockerfile
index 99da43a46..7feb50cfe 100755
--- a/release/preview/nanoserver/docker/Dockerfile
+++ b/release/preview/nanoserver/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
 FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
 
 # Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.1.0-rc.1
+ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -45,22 +45,6 @@ ARG VCS_REF="none"
 ARG PS_VERSION=6.1.0-rc.1
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
@@ -89,4 +73,20 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
 CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index 4e77e8d35..c92e961e0 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
 FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
 
 # Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.2.0-rc.1
+ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -45,22 +45,6 @@ ARG VCS_REF="none"
 ARG PS_VERSION=6.2.0-rc.1
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
@@ -102,4 +86,20 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
 CMD ["pwsh.exe"]
diff --git a/release/preview/opensuse423/docker/Dockerfile b/release/preview/opensuse423/docker/Dockerfile
index 5b9326bc1..287c8d157 100644
--- a/release/preview/opensuse423/docker/Dockerfile
+++ b/release/preview/opensuse423/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG imageRepo=opensuse/leap
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/opensuse423/test-deps/docker/Dockerfile b/release/preview/opensuse423/test-deps/docker/Dockerfile
index fd2167edf..8e71e61d6 100644
--- a/release/preview/opensuse423/test-deps/docker/Dockerfile
+++ b/release/preview/opensuse423/test-deps/docker/Dockerfile
@@ -23,7 +23,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-OpenSUSE-${fromTag}
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos7
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index fe5360287..649b68a9a 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=ubuntu
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0~rc.1
+ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
index 0ffdc1003..cd956e14d 100644
--- a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
@@ -19,7 +19,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 7c0e6ece0..18bc2e89f 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=ubuntu
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0~rc.1
+ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
index 6668471c6..629df4a11 100644
--- a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
@@ -19,7 +19,7 @@ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile
index e25dcf8c4..ac32a1c3c 100755
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore/docker/Dockerfile
@@ -6,7 +6,7 @@ ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 # As this is a multi-stage build, this stage will eventually be thrown away
 FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0-preview.4
+ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
 
 SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]

From 58635e6aecebdb3684568c5e40887de6e9488ca7 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Wed, 8 Jan 2020 14:35:10 -0500
Subject: [PATCH 037/354] Add terms page (#354)

---
 docs/terms.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 docs/terms.md

diff --git a/docs/terms.md b/docs/terms.md
new file mode 100644
index 000000000..a1c311848
--- /dev/null
+++ b/docs/terms.md
@@ -0,0 +1,6 @@
+# PowerShell-Docker Commonly Used Terms Guide
+
+* Docker - A container management platform
+* Image - A Docker image (all located in `/release`)
+* Azure DevOps (formerly **V**isual **S**tudio **T**eam **S**ervices) - the CI system used to test the project
+* Tags - metadata that describes images

From 6493e84c67318c577c32a27a4f496a9baa4c4ade Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 10 Jan 2020 17:09:46 -0800
Subject: [PATCH 038/354] Initial refactor of CI for LTS release (#357)

* Got working prototype

* filter ACR build to Linux.

* revert nanoserver get latest tag changes

* Address PR Comments
---
 .vsts-ci/phase.yml                   |  71 +++----
 .vsts-ci/stage.yml                   |  41 +++++
 .vsts-ci/vsts-arm-ci.yml             |  41 ++---
 build.ps1                            | 112 ++++++++++--
 release/preview/nanoserver/meta.json |   1 +
 release/stable/nanoserver/meta.json  |   1 +
 tools/buildHelper/buildHelper.psm1   |  11 +-
 vsts-ci.yml                          | 264 +++++----------------------
 8 files changed, 238 insertions(+), 304 deletions(-)
 create mode 100644 .vsts-ci/stage.yml

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index dec2534c1..cf4d15791 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -1,21 +1,21 @@
 parameters:
   name: ''
-  imagename: ''
   vmImage: 'ubuntu-16.04'
-  stable: 'true'
-  servicing: 'false'
-  preview: 'true'
-  communityStable: 'false'
-  communityPreview: 'false'
-  communityServicing: 'false'
   continueonerror: false
   ciParameter: '-CI'
   useacr: 'false'
+  matrix: ''
+  dependsOn: 'GenerateYaml'
+  jobName: 'Build'
+  maxParallel: 5
 
 jobs:
-- job: ${{ parameters.name }}
+- job: ${{ parameters.jobName }}
+  dependsOn: ${{ parameters.dependsOn }}
+  strategy:
+      matrix: $[ ${{ parameters.matrix }} ]
+      maxParallel: ${{ parameters.maxParallel }}
   variables:
-    ImageName: ${{ parameters.imagename }}
     ContinueOnError: ${{ parameters.continueonerror }}
 
   pool:
@@ -30,62 +30,39 @@ jobs:
   - ${{ if eq(parameters.useacr, 'true') }}:
     - pwsh: 'Get-ChildItem env:'
       displayName: 'Capture Environment'
+      condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - ${{ if eq(parameters.useacr, 'true') }}:
     - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
       displayName: 'az login'
+      condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: Install-module pester -Scope CurrentUser -Force
-    displayName: Install Pester
-    condition: succeededOrFailed()
-
-  - ${{ if eq(parameters.stable, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
-      displayName: $(ImageName) Stable
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
-
-  - ${{ if eq(parameters.preview, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
-      displayName: $(ImageName) Preview
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
-
-  - ${{ if eq(parameters.servicing, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
-      displayName: $(ImageName) Servicing
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
 
-  - ${{ if eq(parameters.communityStable, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-stable' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
-      displayName: $(ImageName) Stable
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
+  - pwsh: |
+      if ( '$env:CHANNEL' -eq '' ) { exit }
+      Install-module pester -Scope CurrentUser -Force
+    displayName: Install Pester
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - ${{ if eq(parameters.communityPreview, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-preview' -TestLogPostfix '$(ImageName)-preview' ${{ parameters.ciParameter }} -Repository preview/powershell
-      displayName: $(ImageName) Preview
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
+  - pwsh: |
+      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
+    displayName: $(ImageName) $(Channel)
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+    continueOnError: ${{ parameters.continueonerror }}
 
-  - ${{ if eq(parameters.communityServicing, 'true') }}:
-    - pwsh: ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel 'community-servicing' -TestLogPostfix '$(ImageName)-servicing' ${{ parameters.ciParameter }} -Repository servicing/powershell
-      displayName: $(ImageName) Servicing
-      condition: succeededOrFailed()
-      continueOnError: ${{ parameters.continueonerror }}
 
   - pwsh: |
+      if ( '$env:CHANNEL' -eq '' ) { exit }
       $files = @(Get-ChildItem -Recurse test*.xml)
       if($files.count -eq 0) {
         throw 'no test results found'
       }
     displayName: Make sure we got test results
-    condition: succeededOrFailed()
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ parameters.continueonerror }}
 
   - task: PublishTestResults@2
-    condition: succeededOrFailed()
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     displayName: Publish $(ImageName) Test Results **\test*.xml
     continueOnError: ${{ parameters.continueonerror }}
     inputs:
diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
new file mode 100644
index 000000000..ab055831a
--- /dev/null
+++ b/.vsts-ci/stage.yml
@@ -0,0 +1,41 @@
+parameters:
+  channel: 'preview'
+  vmImage: 'ubuntu-16.04'
+  winCiParameter: '-CI -TagFilter 1809'
+  acr: 'NoAcr'
+  useacr: 'false'
+  osFilter: 'All'
+
+stages:
+  - stage: GenerateYaml_${{ parameters.channel }}
+    dependsOn: []
+    displayName: Build ${{ parameters.channel }}
+    jobs:
+    - job: GenerateYaml_${{ parameters.channel }}
+      pool:
+        vmImage: ubuntu-16.04
+      displayName: Generate Matrix YAML ${{ parameters.channel }}
+      steps:
+      - pwsh: |
+          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+        displayName: Generate Matrix YAML
+        condition: succeededOrFailed()
+        name: matrix
+      - pwsh: |
+          dir env:matrix_* | out-string -Width 1000
+        displayName: Capture Matrix YAML
+        condition: succeededOrFailed()
+    - template: phase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        dependsOn: GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Linux
+        useacr: ${{ parameters.useacr }}
+    - template: phase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        dependsOn: GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Win
+        vmImage: windows-2019
+        ciParameter: ${{ parameters.winCiParameter }}
+        useacr: ${{ parameters.useacr }}
diff --git a/.vsts-ci/vsts-arm-ci.yml b/.vsts-ci/vsts-arm-ci.yml
index 8b44e203d..8fb2c477e 100644
--- a/.vsts-ci/vsts-arm-ci.yml
+++ b/.vsts-ci/vsts-arm-ci.yml
@@ -7,30 +7,17 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-jobs:
-
-- job: Set_Build_Name
-  pool:
-    vmImage: ubuntu-16.04
-  displayName: Set Build Name
-  condition: ne(variables['Build.Reason'], 'PullRequest')
-  steps:
-  - pwsh:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-- template: phase.yml
-  parameters:
-    name: arm32v7
-    imagename: arm32v7
-    stable: false
-    preview: true
-    useacr: true
-
-- template: phase.yml
-  parameters:
-    name: centos7
-    imagename: centos7
-    stable: false
-    preview: true
-    useacr: true
+stages:
+  - template: stage.yml
+    parameters:
+      channel: stable
+      acr: OnlyAcr
+      useacr: true
+      osFilter: Linux
+  - template: stage.yml
+    parameters:
+      channel: preview
+      acr: OnlyAcr
+      useacr: true
+      winCiParameter: ''
+      osFilter: Linux
diff --git a/build.ps1 b/build.ps1
index 84ee661b0..76e621120 100755
--- a/build.ps1
+++ b/build.ps1
@@ -30,6 +30,10 @@ param(
     [switch]
     $Pull,
 
+    [Parameter(Mandatory, ParameterSetName="GenerateMatrixJson")]
+    [switch]
+    $GenerateMatrixJson,
+
     [Parameter(Mandatory, ParameterSetName="GenerateTagsYaml")]
     [switch]
     $GenerateTagsYaml,
@@ -88,6 +92,7 @@ param(
     [Parameter(Mandatory, ParameterSetName="GetTagsAll")]
     [Parameter(Mandatory, ParameterSetName="DupeCheckAll")]
     [Parameter(Mandatory, ParameterSetName="GenerateTagsYaml")]
+    [Parameter(Mandatory, ParameterSetName="GenerateMatrixJson")]
     [string[]]
     $Channel='stable',
 
@@ -107,16 +112,19 @@ param(
     [string]
     $Version,
 
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
     $StableVersion,
 
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
     $PreviewVersion,
 
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
@@ -126,7 +134,18 @@ param(
     $IncludeKnownIssues,
 
     [switch]
-    $ForcePesterInstall
+    $ForcePesterInstall,
+
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [string]
+    [ValidateSet('All','OnlyAcr','NoAcr')]
+    $Acr,
+
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [string]
+    [ValidateSet('All','Linux','Windows')]
+    $OsFilter
+
 )
 
 DynamicParam {
@@ -177,7 +196,7 @@ DynamicParam {
 }
 
 Begin {
-    if ($PSCmdlet.ParameterSetName -notin 'GenerateTagsYaml', 'DupeCheckAll' -and $Channel.Count -gt 1)
+    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
     }
@@ -240,7 +259,8 @@ End {
                 -ImageName $ImageName `
                 -LinuxVersion $linuxVersion `
                 -BaseRepositry $Repository `
-                -Strict:$CheckForDuplicateTags.IsPresent
+                -Strict:$CheckForDuplicateTags.IsPresent `
+                -Channel $actualChannel
 
             $nameForMessage = Split-Path -Leaf -Path $dockerFileName
             $message = "$nameForMessage does not exist in every channel. Skipping."
@@ -275,7 +295,8 @@ End {
                             -BaseImage $actualTagData.ActualTags[0] `
                             -BaseRepositry $Repository `
                             -Strict:$CheckForDuplicateTags.IsPresent `
-                            -FromTag $tagGroup.Name
+                            -FromTag $tagGroup.Name `
+                            -Channel $actualChannel
 
                         $toBuild += $subImageAllMeta
                     }
@@ -288,7 +309,10 @@ End {
     {
         foreach ($tagGroup in $allMeta.ActualTagDataByGroup.Keys)
         {
+            $dockerFileName = $allMeta.Name
             $actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
+            $actualChannel = $allMeta.Channel
+            $useAcr = $allMeta.meta.UseAcr
 
             if ($Build.IsPresent -or $Test.IsPresent)
             {
@@ -330,13 +354,31 @@ End {
                     }
                 }
             }
-            elseif ($GenerateTagsYaml.IsPresent) {
+            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent) {
+                if($Acr -eq 'OnlyAcr' -and !$useAcr)
+                {
+                    continue
+                }
+
+                if($Acr -eq 'NoAcr' -and $useAcr)
+                {
+                    continue
+                }
+
                 $tagGroup = "public/$($allMeta.FullRepository)"
                 $os = 'windows'
-                if($allMeta.meta.IsLinux)
-                {
+                if ($allMeta.meta.IsLinux) {
                     $os = 'linux'
                 }
+
+                if ($osFilter -eq 'Linux' -and $os -ne 'linux') {
+                    continue
+                }
+
+                if ($osFilter -eq 'Windows' -and $os -ne 'windows') {
+                    continue
+                }
+
                 $architecture = 'amd64'
                 $imagePath = $allMeta.imagePath
                 $relativeImagePath = $imagePath -replace $PSScriptRoot
@@ -356,10 +398,13 @@ End {
 
                     $tag = [PSCustomObject]@{
                         Architecture = $architecture
-                        OsVersion = $osVersion
-                        Os = $os
-                        Tags = $actualTagData.TagList
-                        Dockerfile = $dockerfile
+                        OsVersion    = $osVersion
+                        Os           = $os
+                        Tags         = $actualTagData.TagList
+                        Dockerfile   = $dockerfile
+                        Channel      = $actualChannel
+                        Name         = $dockerFileName
+                        UseAcr       = $UseAcr
                     }
 
                     $tagGroups[$tagGroup] += $tag
@@ -448,6 +493,51 @@ End {
         }
     }
 
+    if ($GenerateMatrixJson.IsPresent) {
+        $matrix = @{ }
+        foreach ($repo in $tagGroups.Keys | Sort-Object) {
+            $channelGroups = $tagGroups.$repo | Group-Object -Property Channel
+            foreach($channelGroup in $channelGroups)
+            {
+                $channelName = $channelGroup.Name
+                Write-Verbose "generating $channelName json"
+                $osGroups = $channelGroup.Group | Group-Object -Property os
+                foreach ($osGroup in $osGroups) {
+                    $osName = $osGroup.Name
+
+                    # Filter out subimages.  We cannot directly build subimages.
+                    foreach ($tag in $osGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property dockerfile) {
+                        if (-not $matrix.ContainsKey($channelName)) {
+                            $matrix.Add($channelName, @{ })
+                        }
+
+                        if (-not $matrix.$channelName.ContainsKey($osName)) {
+                            $matrix.$channelName.Add($osName, @{ })
+                        }
+
+                        if (-not $matrix.$channelName[$osName].ContainsKey($tag.Name)) {
+                            $matrix.$channelName[$osName].Add($tag.Name, @{
+                                    Channel   = $tag.Channel
+                                    ImageName = $tag.Name
+                                })
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach ($channelName in $matrix.Keys) {
+            foreach ($osName in $matrix.$channelName.Keys) {
+                $osMatrix = $matrix.$channelName.$osName
+                $matrixJson = $osMatrix | ConvertTo-Json -Compress
+                $variableName = "matrix_${channelName}_${osName}"
+                $command = "vso[task.setvariable variable=$variableName;isoutput=true]$($matrixJson)"
+                Write-Verbose "sending command: '$command'"
+                Write-Host "##$command"
+            }
+        }
+    }
+
     if($CheckForDuplicateTags.IsPresent)
     {
         if($dupeTagIssues.count -gt 0)
diff --git a/release/preview/nanoserver/meta.json b/release/preview/nanoserver/meta.json
index e46c68334..ec6260a17 100644
--- a/release/preview/nanoserver/meta.json
+++ b/release/preview/nanoserver/meta.json
@@ -10,6 +10,7 @@
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
+    "UseAcr": true,
     "TestProperties": {
         "size": 1
     }
diff --git a/release/stable/nanoserver/meta.json b/release/stable/nanoserver/meta.json
index 32cbc495e..922d241a4 100644
--- a/release/stable/nanoserver/meta.json
+++ b/release/stable/nanoserver/meta.json
@@ -10,6 +10,7 @@
         "nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
+    "UseAcr": true,
     "TestProperties": {
         "size": 1
     }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index cb6dd12dd..74d35e2f3 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -156,7 +156,7 @@ class DockerImageMetaData {
 
     [bool]
     $UseAcr = $false
-    
+
     [bool]
     $IsBroken = $false
 }
@@ -328,6 +328,8 @@ class DockerImageFullMetaData
     [string] $PSVersion
     [string] $BaseImage
     [string] $FullRepository
+    [string] $Name
+    [string] $Channel
 }
 
 class UpstreamImageTagData
@@ -380,7 +382,10 @@ function Get-DockerImageMetaDataWrapper
         $Strict,
 
         [string]
-        $FromTag
+        $FromTag,
+
+        [string]
+        $Channel
     )
 
     $imagePath = Join-Path -Path $ChannelPath -ChildPath $dockerFileName
@@ -491,6 +496,8 @@ function Get-DockerImageMetaDataWrapper
         PSVersion = $psversion
         BaseImage = $BaseImage
         FullRepository = $fullRepository
+        Name = $dockerFileName
+        Channel = $Channel
     }
 }
 
diff --git a/vsts-ci.yml b/vsts-ci.yml
index e4e01bb67..4ab63f7b5 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -7,220 +7,50 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-jobs:
-
-- job: Set_Build_Name
-  pool:
-    vmImage: ubuntu-16.04
-  displayName: Check For Duplicate Tags
-  steps:
-  - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-  - pwsh: ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, servicing
-    displayName: Check for Duplicate Tags
-    condition: succeededOrFailed()
-
-- job: Secret_Scan
-  pool: 'Hosted VS2017'
-  displayName: Secret Scan
-
-  steps:
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-    displayName: 'Scan for secrets'
-    inputs:
-      debugMode: false
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-    displayName: 'Publish Secret Scan Logs to Build Artifacts'
-    continueOnError: true
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
-    displayName: 'Check for Failures'
-    inputs:
-      CredScan: true
-      ToolLogsNotFoundAction: Error
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: ubuntu1604
-    imagename: ubuntu16.04
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: ubuntu1804
-    imagename: ubuntu18.04
-    stable: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: centos7
-    imagename: centos7
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: centos8
-    imagename: centos8
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: fedora
-    imagename: fedora
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: fedora28
-    imagename: fedora28
-    stable: true
-    preview: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: alpine
-    imagename: alpine
-    stable: true
-    preview: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: alpine38
-    imagename: alpine38
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: alpine39
-    imagename: alpine39
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: opensuse423
-    imagename: opensuse423
-    stable: true
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: debian9
-    imagename: debian9
-    stable: true
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: debian10
-    imagename: debian10
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: debian11
-    imagename: debian11
-    stable: false
-    preview: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: kaliRolling
-    imagename: kali-rolling
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: archlinux
-    imagename: archlinux
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: blackArch
-    imagename: blackarch
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: parrot
-    imagename: parrot
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: amazonLinux
-    imagename: amazonlinux
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: oracleLinux
-    imagename: oraclelinux
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: clearLinux
-    imagename: clearlinux
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: true
-
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: photon
-    imagename: photon
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-
-
-# The -CI filters to LTSC-2016 for nanoserver by default, which is the only thing that works on Hosted VS2017
-# Skipping previews on windows due to how long it takes to build on windows
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: nanoserver_1809
-    imagename: nanoserver1809
-    vmImage: windows-2019
-    preview: false
-    ciParameter: '-CI -TagFilter 1809'
-    continueonerror: false
-
-# Use the TagFilter to filter to 1809 because the docker instance inside the agent only supports 1809
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: windowsservercore_1809
-    vmImage: windows-2019
-    imagename: windowsservercore
-    preview: false
-    ciParameter: '-CI -TagFilter 1809'
+stages:
+  - template: .vsts-ci/stage.yml
+    parameters:
+      channel: stable
+  - template: .vsts-ci/stage.yml
+    parameters:
+      channel: preview
+
+  - stage: CheckForDuplicateTags
+    displayName: Check for duplicate tags
+    dependsOn: []
+    jobs:
+    - job: CheckForDuplicateTags
+      pool:
+        vmImage: ubuntu-16.04
+      displayName: Check For Duplicate Tags
+      steps:
+      - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+        displayName: Set Build Name for Non-PR
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+      - pwsh: ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, servicing
+        displayName: Check for Duplicate Tags
+        condition: succeededOrFailed()
+
+  - stage: Secret_Scan
+    displayName: Secret Scan
+    dependsOn: []
+    jobs:
+    - job: Secret_Scan
+      pool: 'Hosted VS2017'
+      displayName: Secret Scan
+
+      steps:
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+        displayName: 'Scan for secrets'
+        inputs:
+          debugMode: false
+
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+        displayName: 'Publish Secret Scan Logs to Build Artifacts'
+        continueOnError: true
+
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
+        displayName: 'Check for Failures'
+        inputs:
+          CredScan: true
+          ToolLogsNotFoundAction: Error

From 9ec564ef7e2fb0f0362d96294ad3d16213c818c1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <github@ez13.net>
Date: Fri, 10 Jan 2020 17:39:26 -0800
Subject: [PATCH 039/354] first try

---
 .vsts-ci/phase.yml        |   2 +-
 .vsts-ci/releasePhase.yml |  10 +-
 .vsts-ci/releaseStage.yml |  39 ++++++++
 .vsts-ci/releasebuild.yml | 200 ++++++++++++++++----------------------
 4 files changed, 133 insertions(+), 118 deletions(-)
 create mode 100644 .vsts-ci/releaseStage.yml

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index cf4d15791..e582cc2b7 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -45,7 +45,7 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
+      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
     displayName: $(ImageName) $(Channel)
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ parameters.continueonerror }}
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 14b8c46b5..6c41f9f15 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,12 +1,16 @@
 parameters:
   pool: 'Hosted Ubuntu 1604'
-  channel: 'stable'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
+  maxParallel: 5
 
 jobs:
 - job: ${{ parameters.jobName }}
+  dependsOn: ${{ parameters.dependsOn }}
+  strategy:
+      matrix: $[ ${{ parameters.matrix }} ]
+      maxParallel: ${{ parameters.maxParallel }}
   variables:
     dockerImage: 'powershell'
     Channel: ${{ parameters.channel }}
@@ -44,7 +48,7 @@ jobs:
 
   - pwsh: |
       az account set --subscription $(StorageSubscriptionName)
-      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(2).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
+      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(1).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
       $url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
       Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
@@ -74,7 +78,7 @@ jobs:
 
       if($env:$(Channel) -eq 'true')
       {
-        ./build.ps1 -Build -ImageName $(dockerHost) -All -Channel $(channel) @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
+        ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
       }
       else
       {
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
new file mode 100644
index 000000000..bd50e9e4f
--- /dev/null
+++ b/.vsts-ci/releaseStage.yml
@@ -0,0 +1,39 @@
+parameters:
+  channel: 'preview'
+  vmImage: 'ubuntu-16.04'
+  acr: 'All'
+  useacr: 'false'
+  osFilter: 'All'
+
+stages:
+  - stage: GenerateYaml_${{ parameters.channel }}
+    dependsOn: []
+    displayName: Build ${{ parameters.channel }}
+    jobs:
+    - job: GenerateYaml_${{ parameters.channel }}
+      pool:
+        vmImage: ubuntu-16.04
+      displayName: Generate Matrix YAML ${{ parameters.channel }}
+      steps:
+      - pwsh: |
+          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+        displayName: Generate Matrix YAML
+        condition: succeededOrFailed()
+        name: matrix
+      - pwsh: |
+          dir env:matrix_* | out-string -Width 1000
+        displayName: Capture Matrix YAML
+        condition: succeededOrFailed()
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        dependsOn: GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Linux
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        dependsOn: GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Win
+        vmImage: windows-2019
+        ciParameter: ${{ parameters.winCiParameter }}
+        ACR: yes
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 9795c4faa..a050f9070 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -7,117 +7,89 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-jobs:
-- template: releasePhase.yml
-  parameters:
-    channel: STABLE
-    jobName: stableLinux
-    releaseTag: $(stableReleaseTag)
-    pool: Hosted Ubuntu 1604
-    ACR: no
-
-- template: releasePhase.yml
-  parameters:
-    channel: PREVIEW
-    jobName: previewLinux
-    releaseTag: $(previewReleaseTag)
-    pool: Hosted Ubuntu 1604
-    ACR: no
-
-- template: releasePhase.yml
-  parameters:
-    channel: STABLE
-    jobName: stableWindows
-    releaseTag: $(stableReleaseTag)
-    pool: Hosted VS2017
-    ACR: yes
-
-- template: releasePhase.yml
-  parameters:
-    channel: PREVIEW
-    jobName: previewWindows
-    releaseTag: $(previewReleaseTag)
-    pool: Hosted VS2017
-    ACR: yes
-
-- job: PreviewManifestPhase
-  variables:
-    releaseTag: $(previewReleaseTag)
-    channel: PREVIEW
-
-  displayName: Create Preview Manifest Lists
-
-  dependsOn:
-   - previewLinux
-   - previewWindows
-  condition: succeededOrFailed()
-  pool:
-    name: PowerShell
-    timeoutInMinutes: 30
-
-  steps:
-  - template: manifestSteps.yml
-
-- job: StableManifestPhase
-  variables:
-    releaseTag: $(stableReleaseTag)
-    channel: STABLE
-
-  displayName: Create Stable Manifest Lists
-
-  dependsOn:
-   - stableWindows
-   - stableLinux
-  condition: succeededOrFailed()
-  pool:
-    name: PowerShell
-    timeoutInMinutes: 30
-
-  steps:
-  - template: manifestSteps.yml
-
-- job: GenerateTagsYaml
-
-  displayName: Generate Tags YAML
-
-  condition: succeededOrFailed()
-  pool:
-    name: Hosted Ubuntu 1604
-    timeoutInMinutes: 30
-
-  steps:
-  - powershell: |
-      $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
-      Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
-      $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
-      Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
-    displayName: 'Set Versions'
-
-  - powershell: 'Get-ChildItem env:'
-    displayName: 'Capture Environment'
-
-  - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
-    displayName: 'Install Pester'
-
-  - powershell: |
-        $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
-        $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
-        Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
-                Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
-            }
-    displayName: Generate Tags YAML
-
-  - powershell: |
-      $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
-      @{
-        'previewReleaseTag' = '$(previewReleaseTag)'
-        'stableReleaseTag' = '$(stableReleaseTag)'
-      }|convertto-json | out-file -FilePath $path -Encoding ascii
-      Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
-    displayName: Save release Tags
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true
+stages:
+  - template: releaseStage.yml
+    parameters:
+      channel: stable
+  - template: releaseStage.yml
+    parameters:
+      channel: preview
+
+  - stage: GenerateManifests
+    - job: PreviewManifestPhase
+      variables:
+        releaseTag: $(previewReleaseTag)
+        channel: PREVIEW
+
+      displayName: Create Preview Manifest Lists
+      condition: succeededOrFailed()
+      pool:
+        name: PowerShell
+        timeoutInMinutes: 30
+
+      steps:
+      - template: manifestSteps.yml
+    - job: StableManifestPhase
+      variables:
+        releaseTag: $(stableReleaseTag)
+        channel: STABLE
+
+      displayName: Create Stable Manifest Lists
+
+      dependsOn:
+      - stableWindows
+      - stableLinux
+      condition: succeededOrFailed()
+      pool:
+        name: PowerShell
+        timeoutInMinutes: 30
+
+      steps:
+      - template: manifestSteps.yml
+  - stage: GenerateTagsYaml
+    dependsOn: []
+    - job: GenerateTagsYaml
+
+      displayName: Generate Tags YAML
+
+      condition: succeededOrFailed()
+      pool:
+        name: Hosted Ubuntu 1604
+        timeoutInMinutes: 30
+
+      steps:
+      - powershell: |
+          $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
+          Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
+          $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
+          Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
+        displayName: 'Set Versions'
+
+      - powershell: 'Get-ChildItem env:'
+        displayName: 'Capture Environment'
+
+      - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+        displayName: 'Install Pester'
+
+      - powershell: |
+            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
+            $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
+            Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
+                    Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
+                }
+        displayName: Generate Tags YAML
+
+      - powershell: |
+          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
+          @{
+            'previewReleaseTag' = '$(previewReleaseTag)'
+            'stableReleaseTag' = '$(stableReleaseTag)'
+          }|convertto-json | out-file -FilePath $path -Encoding ascii
+          Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
+        displayName: Save release Tags
+
+      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+        displayName: 'Component Detection'
+        inputs:
+          sourceScanPath: '$(Build.SourcesDirectory)'
+          snapshotForceEnabled: true

From 889f6dc4f3ceff63dc93a2f30f73ef5b5bbec84e Mon Sep 17 00:00:00 2001
From: Travis Plunk <github@ez13.net>
Date: Fri, 10 Jan 2020 17:42:34 -0800
Subject: [PATCH 040/354] Revert "first try"

This reverts commit 9ec564ef7e2fb0f0362d96294ad3d16213c818c1.
---
 .vsts-ci/phase.yml        |   2 +-
 .vsts-ci/releasePhase.yml |  10 +-
 .vsts-ci/releaseStage.yml |  39 --------
 .vsts-ci/releasebuild.yml | 200 ++++++++++++++++++++++----------------
 4 files changed, 118 insertions(+), 133 deletions(-)
 delete mode 100644 .vsts-ci/releaseStage.yml

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index e582cc2b7..cf4d15791 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -45,7 +45,7 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
+      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
     displayName: $(ImageName) $(Channel)
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ parameters.continueonerror }}
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 6c41f9f15..14b8c46b5 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,16 +1,12 @@
 parameters:
   pool: 'Hosted Ubuntu 1604'
+  channel: 'stable'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
-  maxParallel: 5
 
 jobs:
 - job: ${{ parameters.jobName }}
-  dependsOn: ${{ parameters.dependsOn }}
-  strategy:
-      matrix: $[ ${{ parameters.matrix }} ]
-      maxParallel: ${{ parameters.maxParallel }}
   variables:
     dockerImage: 'powershell'
     Channel: ${{ parameters.channel }}
@@ -48,7 +44,7 @@ jobs:
 
   - pwsh: |
       az account set --subscription $(StorageSubscriptionName)
-      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(1).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
+      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(2).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
       $url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
       Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
@@ -78,7 +74,7 @@ jobs:
 
       if($env:$(Channel) -eq 'true')
       {
-        ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
+        ./build.ps1 -Build -ImageName $(dockerHost) -All -Channel $(channel) @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
       }
       else
       {
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
deleted file mode 100644
index bd50e9e4f..000000000
--- a/.vsts-ci/releaseStage.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-parameters:
-  channel: 'preview'
-  vmImage: 'ubuntu-16.04'
-  acr: 'All'
-  useacr: 'false'
-  osFilter: 'All'
-
-stages:
-  - stage: GenerateYaml_${{ parameters.channel }}
-    dependsOn: []
-    displayName: Build ${{ parameters.channel }}
-    jobs:
-    - job: GenerateYaml_${{ parameters.channel }}
-      pool:
-        vmImage: ubuntu-16.04
-      displayName: Generate Matrix YAML ${{ parameters.channel }}
-      steps:
-      - pwsh: |
-          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
-        displayName: Generate Matrix YAML
-        condition: succeededOrFailed()
-        name: matrix
-      - pwsh: |
-          dir env:matrix_* | out-string -Width 1000
-        displayName: Capture Matrix YAML
-        condition: succeededOrFailed()
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
-        dependsOn: GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
-        dependsOn: GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Win
-        vmImage: windows-2019
-        ciParameter: ${{ parameters.winCiParameter }}
-        ACR: yes
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index a050f9070..9795c4faa 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -7,89 +7,117 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-stages:
-  - template: releaseStage.yml
-    parameters:
-      channel: stable
-  - template: releaseStage.yml
-    parameters:
-      channel: preview
-
-  - stage: GenerateManifests
-    - job: PreviewManifestPhase
-      variables:
-        releaseTag: $(previewReleaseTag)
-        channel: PREVIEW
-
-      displayName: Create Preview Manifest Lists
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell
-        timeoutInMinutes: 30
-
-      steps:
-      - template: manifestSteps.yml
-    - job: StableManifestPhase
-      variables:
-        releaseTag: $(stableReleaseTag)
-        channel: STABLE
-
-      displayName: Create Stable Manifest Lists
-
-      dependsOn:
-      - stableWindows
-      - stableLinux
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell
-        timeoutInMinutes: 30
-
-      steps:
-      - template: manifestSteps.yml
-  - stage: GenerateTagsYaml
-    dependsOn: []
-    - job: GenerateTagsYaml
-
-      displayName: Generate Tags YAML
-
-      condition: succeededOrFailed()
-      pool:
-        name: Hosted Ubuntu 1604
-        timeoutInMinutes: 30
-
-      steps:
-      - powershell: |
-          $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
-          Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
-          $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
-          Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
-        displayName: 'Set Versions'
-
-      - powershell: 'Get-ChildItem env:'
-        displayName: 'Capture Environment'
-
-      - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
-        displayName: 'Install Pester'
-
-      - powershell: |
-            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
-            $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
-            Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
-                    Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
-                }
-        displayName: Generate Tags YAML
-
-      - powershell: |
-          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
-          @{
-            'previewReleaseTag' = '$(previewReleaseTag)'
-            'stableReleaseTag' = '$(stableReleaseTag)'
-          }|convertto-json | out-file -FilePath $path -Encoding ascii
-          Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
-        displayName: Save release Tags
-
-      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-        displayName: 'Component Detection'
-        inputs:
-          sourceScanPath: '$(Build.SourcesDirectory)'
-          snapshotForceEnabled: true
+jobs:
+- template: releasePhase.yml
+  parameters:
+    channel: STABLE
+    jobName: stableLinux
+    releaseTag: $(stableReleaseTag)
+    pool: Hosted Ubuntu 1604
+    ACR: no
+
+- template: releasePhase.yml
+  parameters:
+    channel: PREVIEW
+    jobName: previewLinux
+    releaseTag: $(previewReleaseTag)
+    pool: Hosted Ubuntu 1604
+    ACR: no
+
+- template: releasePhase.yml
+  parameters:
+    channel: STABLE
+    jobName: stableWindows
+    releaseTag: $(stableReleaseTag)
+    pool: Hosted VS2017
+    ACR: yes
+
+- template: releasePhase.yml
+  parameters:
+    channel: PREVIEW
+    jobName: previewWindows
+    releaseTag: $(previewReleaseTag)
+    pool: Hosted VS2017
+    ACR: yes
+
+- job: PreviewManifestPhase
+  variables:
+    releaseTag: $(previewReleaseTag)
+    channel: PREVIEW
+
+  displayName: Create Preview Manifest Lists
+
+  dependsOn:
+   - previewLinux
+   - previewWindows
+  condition: succeededOrFailed()
+  pool:
+    name: PowerShell
+    timeoutInMinutes: 30
+
+  steps:
+  - template: manifestSteps.yml
+
+- job: StableManifestPhase
+  variables:
+    releaseTag: $(stableReleaseTag)
+    channel: STABLE
+
+  displayName: Create Stable Manifest Lists
+
+  dependsOn:
+   - stableWindows
+   - stableLinux
+  condition: succeededOrFailed()
+  pool:
+    name: PowerShell
+    timeoutInMinutes: 30
+
+  steps:
+  - template: manifestSteps.yml
+
+- job: GenerateTagsYaml
+
+  displayName: Generate Tags YAML
+
+  condition: succeededOrFailed()
+  pool:
+    name: Hosted Ubuntu 1604
+    timeoutInMinutes: 30
+
+  steps:
+  - powershell: |
+      $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
+      Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
+      $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
+      Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
+    displayName: 'Set Versions'
+
+  - powershell: 'Get-ChildItem env:'
+    displayName: 'Capture Environment'
+
+  - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+    displayName: 'Install Pester'
+
+  - powershell: |
+        $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
+        $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
+        Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
+                Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
+            }
+    displayName: Generate Tags YAML
+
+  - powershell: |
+      $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
+      @{
+        'previewReleaseTag' = '$(previewReleaseTag)'
+        'stableReleaseTag' = '$(stableReleaseTag)'
+      }|convertto-json | out-file -FilePath $path -Encoding ascii
+      Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
+    displayName: Save release Tags
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      sourceScanPath: '$(Build.SourcesDirectory)'
+      snapshotForceEnabled: true

From 1b86687fca0c73fec983146114c0cbdad6f46d08 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 14 Jan 2020 12:14:38 -0800
Subject: [PATCH 041/354] Convert release build to use generated matrix (#361)

---
 .vsts-ci/phase.yml        |   2 +-
 .vsts-ci/releasePhase.yml |  68 ++++++++-----
 .vsts-ci/releaseStage.yml |  43 ++++++++
 .vsts-ci/releasebuild.yml | 202 +++++++++++++++++---------------------
 4 files changed, 178 insertions(+), 137 deletions(-)
 create mode 100644 .vsts-ci/releaseStage.yml

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index cf4d15791..e582cc2b7 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -45,7 +45,7 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
+      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
     displayName: $(ImageName) $(Channel)
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ parameters.continueonerror }}
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 14b8c46b5..964e7c0d9 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,19 +1,26 @@
 parameters:
-  pool: 'Hosted Ubuntu 1604'
-  channel: 'stable'
+  vmImage: 'ubuntu-16.04'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
+  maxParallel: 5
+  dependsOn: []
 
 jobs:
 - job: ${{ parameters.jobName }}
+  dependsOn:
+    ${{ parameters.dependsOn }}
+  strategy:
+      matrix: $[ ${{ parameters.matrix }} ]
+      maxParallel: ${{ parameters.maxParallel }}
   variables:
     dockerImage: 'powershell'
     Channel: ${{ parameters.channel }}
     ACR: ${{ parameters.ACR }}
     releaseTag: ${{ parameters.releaseTag }}
 
-  pool: ${{ parameters.pool }}
+  pool:
+    vmImage: ${{ parameters.vmImage }}
   timeoutInMinutes: 135
 
   displayName: ${{ parameters.jobName }}
@@ -22,35 +29,56 @@ jobs:
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
     displayName: 'Enable ACR'
-
-  - pwsh: |
-      $version = '$(releaseTag)' -replace '^v', ''
-      Write-Host "##vso[task.setvariable variable=Version;]$version"
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - powershell: |
+      switch('$(Channel)') {
+        'stable' {
+          $releaseTag = '$(stableReleaseTag)'
+          $version = '$(stableReleaseTag)' -replace '^v', ''
+        }
+        'preview' {
+          $releaseTag = '$(previewReleaseTag)'
+          $version = '$(previewReleaseTag)' -replace '^v', ''
+        }
+        default {
+          throw "Unknown channel '$(Channel)'"
+        }
+      }
+      $namespace = $releaseTag.ToLowerInvariant()
+      Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
+      $version = $releaseTag -replace '^v', ''
+      $command = "vso[task.setvariable variable=version]$version"
+      Write-Host $command
+      Write-Host "##$command"
     displayName: 'Set Version'
+    name: get
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      $namespace = '$(releaseTag)'.ToLowerInvariant()
-      Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
-    displayName: 'Set dockerNamespace'
-
-  - pwsh: 'Get-ChildItem env:'
+      Get-ChildItem env: | Out-String -Width 1000
     displayName: 'Capture Environment'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
     displayName: 'docker login'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
     displayName: 'az login'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
       az account set --subscription $(StorageSubscriptionName)
-      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(2).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
+      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(1).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
       $url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
       Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
     displayName: 'Install Pester'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
       az account set --subscription $(AcrSubscriptionName)
@@ -72,25 +100,21 @@ jobs:
         $extraParams.Add('SasUrl',$env:SASURL)
       }
 
-      if($env:$(Channel) -eq 'true')
-      {
-        ./build.ps1 -Build -ImageName $(dockerHost) -All -Channel $(channel) @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
-      }
-      else
-      {
-        Write-Host 'Current channel disabled, skipping ...'
-      }
+      ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
     displayName: 'Build All $(Channel)'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: 'docker logout $(dockerHost)'
     displayName: 'docker logout'
-    condition: always()
+    condition: and( always(), ne(variables['Channel'],''))
 
   - pwsh: 'az logout'
     displayName: 'az logout'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)'
       snapshotForceEnabled: true
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
new file mode 100644
index 000000000..ba2ec683a
--- /dev/null
+++ b/.vsts-ci/releaseStage.yml
@@ -0,0 +1,43 @@
+parameters:
+  channel: 'preview'
+  vmImage: 'ubuntu-16.04'
+  acr: 'All'
+  useacr: 'false'
+  osFilter: 'All'
+
+stages:
+  - stage: GenerateYaml_${{ parameters.channel }}
+    dependsOn: []
+    displayName: Build ${{ parameters.channel }}
+    jobs:
+    - job: GenerateYaml_${{ parameters.channel }}
+      pool:
+        vmImage: ubuntu-16.04
+      displayName: Generate Matrix YAML ${{ parameters.channel }}
+      steps:
+      - pwsh: |
+          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+        displayName: Generate Matrix YAML
+        condition: succeededOrFailed()
+        name: matrix
+      - pwsh: |
+          dir env:matrix_* | out-string -Width 1000
+        displayName: Capture Matrix YAML
+        condition: succeededOrFailed()
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        dependsOn:
+          - GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Linux
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        dependsOn:
+          - GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Win
+        vmImage: windows-2019
+        ACR: yes
+        # failure rate is High in ACR for Windows and we have few images.
+        # No reason to stress the system.
+        maxParallel: 1
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 9795c4faa..c588e2e32 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -7,117 +7,91 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-jobs:
-- template: releasePhase.yml
-  parameters:
-    channel: STABLE
-    jobName: stableLinux
-    releaseTag: $(stableReleaseTag)
-    pool: Hosted Ubuntu 1604
-    ACR: no
-
-- template: releasePhase.yml
-  parameters:
-    channel: PREVIEW
-    jobName: previewLinux
-    releaseTag: $(previewReleaseTag)
-    pool: Hosted Ubuntu 1604
-    ACR: no
-
-- template: releasePhase.yml
-  parameters:
-    channel: STABLE
-    jobName: stableWindows
-    releaseTag: $(stableReleaseTag)
-    pool: Hosted VS2017
-    ACR: yes
-
-- template: releasePhase.yml
-  parameters:
-    channel: PREVIEW
-    jobName: previewWindows
-    releaseTag: $(previewReleaseTag)
-    pool: Hosted VS2017
-    ACR: yes
-
-- job: PreviewManifestPhase
-  variables:
-    releaseTag: $(previewReleaseTag)
-    channel: PREVIEW
-
-  displayName: Create Preview Manifest Lists
-
-  dependsOn:
-   - previewLinux
-   - previewWindows
-  condition: succeededOrFailed()
-  pool:
-    name: PowerShell
-    timeoutInMinutes: 30
-
-  steps:
-  - template: manifestSteps.yml
-
-- job: StableManifestPhase
-  variables:
-    releaseTag: $(stableReleaseTag)
-    channel: STABLE
-
-  displayName: Create Stable Manifest Lists
-
-  dependsOn:
-   - stableWindows
-   - stableLinux
-  condition: succeededOrFailed()
-  pool:
-    name: PowerShell
-    timeoutInMinutes: 30
-
-  steps:
-  - template: manifestSteps.yml
-
-- job: GenerateTagsYaml
-
-  displayName: Generate Tags YAML
-
-  condition: succeededOrFailed()
-  pool:
-    name: Hosted Ubuntu 1604
-    timeoutInMinutes: 30
-
-  steps:
-  - powershell: |
-      $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
-      Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
-      $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
-      Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
-    displayName: 'Set Versions'
-
-  - powershell: 'Get-ChildItem env:'
-    displayName: 'Capture Environment'
-
-  - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
-    displayName: 'Install Pester'
-
-  - powershell: |
-        $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
-        $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
-        Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
-                Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
-            }
-    displayName: Generate Tags YAML
-
-  - powershell: |
-      $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
-      @{
-        'previewReleaseTag' = '$(previewReleaseTag)'
-        'stableReleaseTag' = '$(stableReleaseTag)'
-      }|convertto-json | out-file -FilePath $path -Encoding ascii
-      Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
-    displayName: Save release Tags
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true
+stages:
+  - template: releaseStage.yml
+    parameters:
+      channel: stable
+  - template: releaseStage.yml
+    parameters:
+      channel: preview
+
+  - stage: GenerateManifests
+    dependsOn:
+      - GenerateYaml_stable
+      - GenerateYaml_preview
+    jobs:
+    - job: PreviewManifestPhase
+      variables:
+        releaseTag: $(previewReleaseTag)
+        channel: PREVIEW
+
+      displayName: Create Preview Manifest Lists
+      condition: succeededOrFailed()
+      pool:
+        name: PowerShell
+        timeoutInMinutes: 30
+
+      steps:
+      - template: manifestSteps.yml
+    - job: StableManifestPhase
+      variables:
+        releaseTag: $(stableReleaseTag)
+        channel: STABLE
+
+      displayName: Create Stable Manifest Lists
+
+      condition: succeededOrFailed()
+      pool:
+        name: PowerShell
+        timeoutInMinutes: 30
+
+      steps:
+      - template: manifestSteps.yml
+  - stage: GenerateTagsYaml
+    dependsOn: []
+    jobs:
+    - job: GenerateTagsYaml
+
+      displayName: Generate Tags YAML
+
+      condition: succeededOrFailed()
+      pool:
+        name: Hosted Ubuntu 1604
+        timeoutInMinutes: 30
+
+      steps:
+      - powershell: |
+          $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
+          Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
+          $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
+          Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
+        displayName: 'Set Versions'
+
+      - powershell: 'Get-ChildItem env:'
+        displayName: 'Capture Environment'
+
+      - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+        displayName: 'Install Pester'
+
+      - powershell: |
+            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
+            $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
+            Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
+                    Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
+                }
+        displayName: Generate Tags YAML
+
+      - powershell: |
+          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
+          @{
+            'previewReleaseTag' = '$(previewReleaseTag)'
+            'stableReleaseTag' = '$(stableReleaseTag)'
+          }|convertto-json | out-file -FilePath $path -Encoding ascii
+          Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
+        displayName: Save release Tags
+
+      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+        displayName: 'Component Detection'
+        inputs:
+          sourceScanPath: '$(Build.SourcesDirectory)'
+          snapshotForceEnabled: true

From 60fe30cdec0ec36d2925177ca8f42c6f8e246c19 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Tue, 28 Jan 2020 12:08:12 -0800
Subject: [PATCH 042/354] Add ncurses to the image so clear works (#367)

---
 release/preview/centos8/docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index d7fdb6ade..4fa59ad8a 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -32,6 +32,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     # remove powershell package

From aee740fd7366e7fc7305d106dfd72b203bf2fc27 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 28 Jan 2020 14:00:30 -0800
Subject: [PATCH 043/354] Add community stable back (#363)

---
 .vsts-ci/communityReleaseBuild.yml            | 29 ++--------
 .vsts-ci/communityReleasePhase.yml            | 51 +++++++++++++++++
 .vsts-ci/communityReleaseStage.yml            | 35 ++++++++++++
 .vsts-ci/phase.yml                            | 15 ++---
 .vsts-ci/stage.yml                            | 15 +++--
 build.ps1                                     | 55 +++++++++++--------
 release/community-stable/clearlinux/meta.json |  3 +-
 release/community-stable/parrot/meta.json     |  3 +-
 tools/buildHelper/buildHelper.psm1            |  3 +
 vsts-ci.yml                                   |  4 ++
 10 files changed, 152 insertions(+), 61 deletions(-)
 create mode 100644 .vsts-ci/communityReleasePhase.yml
 create mode 100644 .vsts-ci/communityReleaseStage.yml

diff --git a/.vsts-ci/communityReleaseBuild.yml b/.vsts-ci/communityReleaseBuild.yml
index c8490a58b..5fcd52f8f 100644
--- a/.vsts-ci/communityReleaseBuild.yml
+++ b/.vsts-ci/communityReleaseBuild.yml
@@ -5,27 +5,8 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
-jobs:
-- job: communityRelease
-  pool:
-    name: Hosted Ubuntu 1604
-  #Your build pipeline references an undefined variable named ‘dockerHost’. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab. See https://go.microsoft.com/fwlink/?linkid=865972
-  #Your build pipeline references an undefined variable named ‘dockerImage’. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab. See https://go.microsoft.com/fwlink/?linkid=865972
-  #Your build pipeline references an undefined variable named ‘dockerKey’. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab. See https://go.microsoft.com/fwlink/?linkid=865972
-  #Your build pipeline references an undefined variable named ‘dockerNamespace’. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab. See https://go.microsoft.com/fwlink/?linkid=865972
-  #Your build pipeline references an undefined variable named ‘dockerUserName’. Create or edit the build pipeline for this YAML file, define the variable on the Variables tab. See https://go.microsoft.com/fwlink/?linkid=865972
-
-  steps:
-  - powershell: 'docker login $(dockerHost) -u $(dockerUserName) -p "$(dockerKey)"'
-    displayName: 'docker login'
-
-  - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
-    displayName: 'Install Pester'
-
-  - powershell: |
-      ./build.ps1 -Build -ImageName $(dockerHost) -All -Channel community-stable -push -Repository $(dockerNamespace)/$(dockerImage)
-    displayName: Build
-
-  - powershell: 'docker logout $(dockerHost)'
-    displayName: 'docker logout'
-    condition: always()
+stages:
+  - template: communityReleaseStage.yml
+    parameters:
+      channel: community-stable
+      jobName: community_stable
diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
new file mode 100644
index 000000000..cade16d58
--- /dev/null
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -0,0 +1,51 @@
+parameters:
+  vmImage: 'ubuntu-16.04'
+  jobName: 'none'
+  releaseTag: ''
+  matrix: ''
+  maxParallel: 5
+  dependsOn: []
+
+jobs:
+- job: ${{ parameters.jobName }}
+  dependsOn: ${{ parameters.dependsOn }}
+  strategy:
+      matrix: $[ ${{ parameters.matrix }} ]
+      maxParallel: ${{ parameters.maxParallel }}
+  variables:
+    dockerImage: 'powershell'
+    Channel: ${{ parameters.channel }}
+    ACR: ${{ parameters.ACR }}
+    releaseTag: ${{ parameters.releaseTag }}
+
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  timeoutInMinutes: 135
+
+
+  steps:
+  - pwsh: |
+      Get-ChildItem env: | Out-String -Width 1000
+    displayName: 'Capture Environment'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
+    displayName: 'docker login'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+    displayName: 'Install Pester'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: |
+      $extraParams = @{}
+      Write-Host 'Not in ACR, will push...'
+      $extraParams.Add('Push',$true)
+
+      ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -Repository $(dockerNamespace)/$(dockerImage)
+    displayName: 'Build'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: 'docker logout $(dockerHost)'
+    displayName: 'docker logout'
+    condition: and( always(), ne(variables['Channel'],''))
diff --git a/.vsts-ci/communityReleaseStage.yml b/.vsts-ci/communityReleaseStage.yml
new file mode 100644
index 000000000..e7e976194
--- /dev/null
+++ b/.vsts-ci/communityReleaseStage.yml
@@ -0,0 +1,35 @@
+parameters:
+  channel: 'preview'
+  jobName: ''
+  vmImage: 'ubuntu-16.04'
+  acr: 'All'
+  useacr: 'false'
+  osFilter: 'All'
+
+stages:
+  - stage: GenerateYaml_${{ coalesce(parameters.jobName, parameters.channel) }}
+    variables:
+      jobName: ${{ coalesce(parameters.jobName, parameters.channel) }}
+    dependsOn: []
+    displayName: Build ${{ parameters.channel }}
+    jobs:
+    - job: GenerateYaml_${{ variables.jobName }}
+      pool:
+        vmImage: ubuntu-16.04
+      displayName: Generate Matrix YAML ${{ parameters.channel }}
+      steps:
+      - pwsh: |
+          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+        displayName: Generate Matrix YAML
+        condition: succeededOrFailed()
+        name: matrix
+      - pwsh: |
+          dir env:matrix_* | out-string -Width 1000
+        displayName: Capture Matrix YAML
+        condition: succeededOrFailed()
+    - template: communityReleasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        dependsOn: GenerateYaml_${{ variables.jobName }}
+        jobName: Build_Linux
+        maxParallel: 2
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index e582cc2b7..6fb3c0e5d 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -27,10 +27,9 @@ jobs:
       displayName: 'Enable ACR'
       condition: ne(variables['ACR'], 'no')
 
-  - ${{ if eq(parameters.useacr, 'true') }}:
-    - pwsh: 'Get-ChildItem env:'
-      displayName: 'Capture Environment'
-      condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+  - pwsh: 'Get-ChildItem env:'
+    displayName: 'Capture Environment'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - ${{ if eq(parameters.useacr, 'true') }}:
     - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
@@ -48,7 +47,7 @@ jobs:
       ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
     displayName: $(ImageName) $(Channel)
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-    continueOnError: ${{ parameters.continueonerror }}
+    continueOnError: ${{ variables.continueonerror }}
 
 
   - pwsh: |
@@ -59,12 +58,14 @@ jobs:
       }
     displayName: Make sure we got test results
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-    continueOnError: ${{ parameters.continueonerror }}
+    continueOnError: ${{ variables.continueonerror }}
+
 
   - task: PublishTestResults@2
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     displayName: Publish $(ImageName) Test Results **\test*.xml
-    continueOnError: ${{ parameters.continueonerror }}
+    continueOnError: ${{ variables.continueonerror }}
+
     inputs:
       testRunner: NUnit
       testResultsFiles: '**\test*.xml'
diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index ab055831a..5ceec85d3 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -1,5 +1,6 @@
 parameters:
   channel: 'preview'
+  jobName: ''
   vmImage: 'ubuntu-16.04'
   winCiParameter: '-CI -TagFilter 1809'
   acr: 'NoAcr'
@@ -7,11 +8,13 @@ parameters:
   osFilter: 'All'
 
 stages:
-  - stage: GenerateYaml_${{ parameters.channel }}
+  - stage: GenerateYaml_${{ coalesce(parameters.jobName, parameters.channel) }}
+    variables:
+      jobName: ${{ coalesce(parameters.jobName, parameters.channel) }}
     dependsOn: []
     displayName: Build ${{ parameters.channel }}
     jobs:
-    - job: GenerateYaml_${{ parameters.channel }}
+    - job: GenerateYaml_${{ variables.jobName }}
       pool:
         vmImage: ubuntu-16.04
       displayName: Generate Matrix YAML ${{ parameters.channel }}
@@ -27,14 +30,14 @@ stages:
         condition: succeededOrFailed()
     - template: phase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
-        dependsOn: GenerateYaml_${{ parameters.channel }}
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        dependsOn: GenerateYaml_${{ variables.jobName }}
         jobName: Build_Linux
         useacr: ${{ parameters.useacr }}
     - template: phase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
-        dependsOn: GenerateYaml_${{ parameters.channel }}
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        dependsOn: GenerateYaml_${{ variables.jobName }}
         jobName: Build_Win
         vmImage: windows-2019
         ciParameter: ${{ parameters.winCiParameter }}
diff --git a/build.ps1 b/build.ps1
index 76e621120..eae8fbc96 100755
--- a/build.ps1
+++ b/build.ps1
@@ -313,18 +313,19 @@ End {
             $actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
             $actualChannel = $allMeta.Channel
             $useAcr = $allMeta.meta.UseAcr
+            $continueOnError = $allMeta.meta.ContinueOnError
 
             if ($Build.IsPresent -or $Test.IsPresent)
             {
                 $params = @{
-                    Dockerfile=$dockerFileName
-                    psversion=$allMeta.psversion
-                    SasData= $sasData
-                    actualChannel= $actualChannel
-                    actualTagData= $actualTagData
-                    actualVersion= $windowsVersion
-                    AllMeta= $allMeta
-                    CI=$CI.IsPresent
+                    Dockerfile    = $dockerFileName
+                    psversion     = $allMeta.psversion
+                    SasData       = $sasData
+                    actualChannel = $actualChannel
+                    actualTagData = $actualTagData
+                    actualVersion = $windowsVersion
+                    AllMeta       = $allMeta
+                    CI            = $CI.IsPresent
                 }
 
                 if($allMeta.BaseImage)
@@ -386,9 +387,14 @@ End {
                 $dockerfile = "https://github.com/PowerShell/PowerShell-Docker/blob/master$relativeImagePath/docker/Dockerfile"
 
                 $osVersion = $allMeta.meta.osVersion
-                if($osVersion)
+                if($osVersion -or $GenerateMatrixJson.IsPresent)
                 {
-                    $osVersion = $osVersion.replace('${fromTag}',$actualTagData.fromTag)
+                    if ($osVersion) {
+                        $osVersion = $osVersion.replace('${fromTag}', $actualTagData.fromTag)
+                    }
+                    else {
+                        $osVersion = ''
+                    }
 
                     if(!$tagGroups.ContainsKey($tagGroup))
                     {
@@ -397,14 +403,15 @@ End {
                     }
 
                     $tag = [PSCustomObject]@{
-                        Architecture = $architecture
-                        OsVersion    = $osVersion
-                        Os           = $os
-                        Tags         = $actualTagData.TagList
-                        Dockerfile   = $dockerfile
-                        Channel      = $actualChannel
-                        Name         = $dockerFileName
-                        UseAcr       = $UseAcr
+                        Architecture    = $architecture
+                        OsVersion       = $osVersion
+                        Os              = $os
+                        Tags            = $actualTagData.TagList
+                        Dockerfile      = $dockerfile
+                        Channel         = $actualChannel
+                        Name            = $dockerFileName
+                        UseAcr          = $UseAcr
+                        ContinueOnError = $continueOnError
                     }
 
                     $tagGroups[$tagGroup] += $tag
@@ -460,6 +467,7 @@ End {
         {
             Install-Module -Name pester -Scope CurrentUser -Force
         }
+
         Write-Verbose -Message "logging to $logPath" -Verbose
         $results = Invoke-Pester -Script $testsPath -OutputFile $logPath -PassThru -OutputFormat NUnitXml @extraParams
         if(!$results -or $results.FailedCount -gt 0 -or !$results.PassedCount)
@@ -515,10 +523,13 @@ End {
                             $matrix.$channelName.Add($osName, @{ })
                         }
 
-                        if (-not $matrix.$channelName[$osName].ContainsKey($tag.Name)) {
-                            $matrix.$channelName[$osName].Add($tag.Name, @{
-                                    Channel   = $tag.Channel
-                                    ImageName = $tag.Name
+                        $jobName = $tag.Name -replace '-', '_'
+                        if (-not $matrix.$channelName[$osName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
+                            $matrix.$channelName[$osName].Add($jobName, @{
+                                    Channel         = $tag.Channel
+                                    ImageName       = $tag.Name
+                                    JobName         = $jobName
+                                    ContinueOnError = $tag.ContinueOnError
                                 })
                         }
                     }
diff --git a/release/community-stable/clearlinux/meta.json b/release/community-stable/clearlinux/meta.json
index 510578268..9284130de 100644
--- a/release/community-stable/clearlinux/meta.json
+++ b/release/community-stable/clearlinux/meta.json
@@ -6,5 +6,6 @@
     "tagTemplates": [
         "#psversion#-clearlinux-#tag#",
         "clearlinux-#shorttag#"
-    ]
+    ],
+    "continueOnError": true
 }
diff --git a/release/community-stable/parrot/meta.json b/release/community-stable/parrot/meta.json
index 5e8f6533c..47d965127 100644
--- a/release/community-stable/parrot/meta.json
+++ b/release/community-stable/parrot/meta.json
@@ -6,5 +6,6 @@
     "tagTemplates": [
         "#psversion#-parrot-#tag#",
         "parrot-#shorttag#"
-    ]
+    ],
+    "continueOnError": true
 }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 74d35e2f3..82af77967 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -159,6 +159,9 @@ class DockerImageMetaData {
 
     [bool]
     $IsBroken = $false
+
+    [bool]
+    $ContinueOnError = $false
 }
 
 class ShortTagMetaData {
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 4ab63f7b5..988ef49a6 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -14,6 +14,10 @@ stages:
   - template: .vsts-ci/stage.yml
     parameters:
       channel: preview
+  - template: .vsts-ci/stage.yml
+    parameters:
+      channel: community-stable
+      jobName: community_stable
 
   - stage: CheckForDuplicateTags
     displayName: Check for duplicate tags

From 549c3ab8e78cc58ba0a1f84470e996766569ae32 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 28 Jan 2020 14:24:17 -0800
Subject: [PATCH 044/354] Update README.powershell.md (#364)

---
 assets/README.powershell.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/README.powershell.md b/assets/README.powershell.md
index 27e5490ba..a2fc169e0 100644
--- a/assets/README.powershell.md
+++ b/assets/README.powershell.md
@@ -62,8 +62,8 @@ PowerShell is licensed under the [MIT license][].
 By requesting and using the Container OS image for Windows containers, you acknowledge, understand,
 and consent to the Supplemental License Terms available on Docker Hub:
 
-- [Windows Server Core](https://store.docker.com/_/windowsservercore)
-- [Nano Server](https://store.docker.com/_/nanoserver)
+- [Windows Server Core](https://hub.docker.com/_/microsoft-windows-servercore)
+- [Nano Server](https://hub.docker.com/_/microsoft-windows-nanoserver)
 
 [Third-Party Software Notices and Information](https://github.com/PowerShell/PowerShell/blob/master/ThirdPartyNotices.txt)
 

From fdaef2da13cb52d93c7883354c26365f45648c41 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 19 Feb 2020 18:02:25 -0800
Subject: [PATCH 045/354] Merge RC3 Version of LTS work (#377)

---
 .vscode/launch.json                           |  22 ++++
 .vsts-ci/phase.yml                            |   9 +-
 .vsts-ci/releasePhase.yml                     |   4 +
 .vsts-ci/releasebuild.yml                     |  11 +-
 .vsts-ci/vsts-arm-ci.yml                      |   1 -
 build.ps1                                     |   9 +-
 release/lts/alpine38/dependabot/Dockerfile    |   1 +
 release/lts/alpine38/docker/Dockerfile        | 110 +++++++++++++++++
 release/lts/alpine38/getLatestTag.ps1         |  14 +++
 release/lts/alpine38/meta.json                |  14 +++
 .../lts/alpine38/test-deps/docker/Dockerfile  |  58 +++++++++
 release/lts/alpine38/test-deps/meta.json      |  16 +++
 .../alpine39}/dependabot/Dockerfile           |   2 +-
 release/lts/alpine39/docker/Dockerfile        | 112 ++++++++++++++++++
 release/lts/alpine39/getLatestTag.ps1         |  14 +++
 release/lts/alpine39/meta.json                |  14 +++
 .../lts/alpine39/test-deps/docker/Dockerfile  |  60 ++++++++++
 release/lts/alpine39/test-deps/meta.json      |  20 ++++
 release/lts/arm32v7/docker/Dockerfile         |  95 +++++++++++++++
 release/lts/arm32v7/getLatestTag.ps1          |  14 +++
 release/lts/arm32v7/meta.json                 |  16 +++
 .../centos7}/docker/Dockerfile                |  42 ++++---
 .../centos7}/getLatestTag.ps1                 |   8 +-
 release/lts/centos7/meta.json                 |  13 ++
 .../centos7}/test-deps/docker/Dockerfile      |  27 ++---
 .../centos7}/test-deps/meta.json              |   7 +-
 release/lts/centos8/dependabot/Dockerfile     |   6 +
 release/lts/centos8/docker/Dockerfile         |  75 ++++++++++++
 release/lts/centos8/getLatestTag.ps1          |  14 +++
 release/lts/centos8/meta.json                 |  13 ++
 .../lts/centos8/test-deps/docker/Dockerfile   |  39 ++++++
 .../centos8}/test-deps/meta.json              |   7 +-
 release/lts/debian10/dependabot/Dockerfile    |   6 +
 .../debian10}/docker/Dockerfile               |  89 +++++++-------
 release/lts/debian10/getLatestTag.ps1         |  14 +++
 release/lts/debian10/meta.json                |  15 +++
 .../lts/debian10/test-deps/docker/Dockerfile  |  43 +++++++
 release/lts/debian10/test-deps/meta.json      |  16 +++
 release/lts/debian11/dependabot/Dockerfile    |   6 +
 release/lts/debian11/docker/Dockerfile        | 112 ++++++++++++++++++
 release/lts/debian11/getLatestTag.ps1         |  14 +++
 release/lts/debian11/meta.json                |  15 +++
 .../lts/debian11/test-deps/docker/Dockerfile  |  43 +++++++
 release/lts/debian11/test-deps/meta.json      |  16 +++
 release/lts/debian9/docker/Dockerfile         |  78 ++++++++++++
 release/lts/debian9/getLatestTag.ps1          |  14 +++
 release/lts/debian9/meta.json                 |  14 +++
 .../lts/debian9/test-deps/docker/Dockerfile   |  43 +++++++
 release/lts/debian9/test-deps/meta.json       |  16 +++
 release/lts/fedora/dependabot/Dockerfile      |   6 +
 release/lts/fedora/docker/Dockerfile          | 110 +++++++++++++++++
 .../fedora28 => lts/fedora}/getLatestTag.ps1  |   4 +-
 release/lts/fedora/meta.json                  |  14 +++
 .../fedora}/test-deps/docker/Dockerfile       |   6 +-
 release/lts/fedora/test-deps/meta.json        |  19 +++
 release/lts/nanoserver/docker/Dockerfile      |  92 ++++++++++++++
 release/lts/nanoserver/getLatestTag.ps1       |  30 +++++
 release/lts/nanoserver/meta.json              |  16 +++
 .../lts/nanoserver1809/dependabot/Dockerfile  |   6 +
 release/lts/nanoserver1809/docker/Dockerfile  | 105 ++++++++++++++++
 release/lts/nanoserver1809/getLatestTag.ps1   |  21 ++++
 release/lts/nanoserver1809/meta.json          |  16 +++
 release/lts/ubuntu16.04/docker/Dockerfile     |  75 ++++++++++++
 release/lts/ubuntu16.04/getLatestTag.ps1      |  14 +++
 release/lts/ubuntu16.04/meta.json             |  14 +++
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  42 +++++++
 release/lts/ubuntu16.04/test-deps/meta.json   |  16 +++
 release/lts/ubuntu18.04/dependabot/Dockerfile |   6 +
 release/lts/ubuntu18.04/docker/Dockerfile     |  75 ++++++++++++
 release/lts/ubuntu18.04/getLatestTag.ps1      |  14 +++
 release/lts/ubuntu18.04/meta.json             |  14 +++
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  42 +++++++
 release/lts/ubuntu18.04/test-deps/meta.json   |  16 +++
 .../windowsservercore/dependabot/Dockerfile   |   6 +
 .../lts/windowsservercore/docker/Dockerfile   |  85 +++++++++++++
 .../lts/windowsservercore/getLatestTag.ps1    |  19 +++
 release/lts/windowsservercore/meta.json       |  12 ++
 release/preview/fedora/getLatestTag.ps1       |   2 +-
 release/preview/fedora/test-deps/meta.json    |   2 -
 release/preview/nanoserver1809/meta.json      |   3 +-
 release/preview/opensuse423/meta.json         |  15 ---
 .../windowsservercore/getLatestTag.ps1        |   2 +-
 release/stable/fedora28/meta.json             |  15 ---
 release/stable/nanoserver1809/meta.json       |   3 +-
 .../stable/windowsservercore/getLatestTag.ps1 |   2 +-
 tests/container.tests.ps1                     |  61 +++++++---
 tools/buildHelper/buildHelper.psm1            |  43 ++++++-
 vsts-ci.yml                                   |   6 +-
 88 files changed, 2314 insertions(+), 156 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 release/lts/alpine38/dependabot/Dockerfile
 create mode 100644 release/lts/alpine38/docker/Dockerfile
 create mode 100644 release/lts/alpine38/getLatestTag.ps1
 create mode 100644 release/lts/alpine38/meta.json
 create mode 100644 release/lts/alpine38/test-deps/docker/Dockerfile
 create mode 100644 release/lts/alpine38/test-deps/meta.json
 rename release/{preview/opensuse423 => lts/alpine39}/dependabot/Dockerfile (85%)
 create mode 100644 release/lts/alpine39/docker/Dockerfile
 create mode 100644 release/lts/alpine39/getLatestTag.ps1
 create mode 100644 release/lts/alpine39/meta.json
 create mode 100644 release/lts/alpine39/test-deps/docker/Dockerfile
 create mode 100644 release/lts/alpine39/test-deps/meta.json
 create mode 100644 release/lts/arm32v7/docker/Dockerfile
 create mode 100644 release/lts/arm32v7/getLatestTag.ps1
 create mode 100644 release/lts/arm32v7/meta.json
 rename release/{stable/fedora28 => lts/centos7}/docker/Dockerfile (73%)
 rename release/{preview/opensuse423 => lts/centos7}/getLatestTag.ps1 (57%)
 create mode 100644 release/lts/centos7/meta.json
 rename release/{preview/opensuse423 => lts/centos7}/test-deps/docker/Dockerfile (68%)
 rename release/{stable/fedora28 => lts/centos7}/test-deps/meta.json (63%)
 create mode 100644 release/lts/centos8/dependabot/Dockerfile
 create mode 100644 release/lts/centos8/docker/Dockerfile
 create mode 100644 release/lts/centos8/getLatestTag.ps1
 create mode 100644 release/lts/centos8/meta.json
 create mode 100644 release/lts/centos8/test-deps/docker/Dockerfile
 rename release/{preview/opensuse423 => lts/centos8}/test-deps/meta.json (61%)
 create mode 100644 release/lts/debian10/dependabot/Dockerfile
 rename release/{preview/opensuse423 => lts/debian10}/docker/Dockerfile (67%)
 create mode 100644 release/lts/debian10/getLatestTag.ps1
 create mode 100644 release/lts/debian10/meta.json
 create mode 100644 release/lts/debian10/test-deps/docker/Dockerfile
 create mode 100644 release/lts/debian10/test-deps/meta.json
 create mode 100644 release/lts/debian11/dependabot/Dockerfile
 create mode 100644 release/lts/debian11/docker/Dockerfile
 create mode 100644 release/lts/debian11/getLatestTag.ps1
 create mode 100644 release/lts/debian11/meta.json
 create mode 100644 release/lts/debian11/test-deps/docker/Dockerfile
 create mode 100644 release/lts/debian11/test-deps/meta.json
 create mode 100644 release/lts/debian9/docker/Dockerfile
 create mode 100644 release/lts/debian9/getLatestTag.ps1
 create mode 100644 release/lts/debian9/meta.json
 create mode 100644 release/lts/debian9/test-deps/docker/Dockerfile
 create mode 100644 release/lts/debian9/test-deps/meta.json
 create mode 100644 release/lts/fedora/dependabot/Dockerfile
 create mode 100644 release/lts/fedora/docker/Dockerfile
 rename release/{stable/fedora28 => lts/fedora}/getLatestTag.ps1 (91%)
 create mode 100644 release/lts/fedora/meta.json
 rename release/{stable/fedora28 => lts/fedora}/test-deps/docker/Dockerfile (94%)
 create mode 100644 release/lts/fedora/test-deps/meta.json
 create mode 100755 release/lts/nanoserver/docker/Dockerfile
 create mode 100644 release/lts/nanoserver/getLatestTag.ps1
 create mode 100644 release/lts/nanoserver/meta.json
 create mode 100644 release/lts/nanoserver1809/dependabot/Dockerfile
 create mode 100755 release/lts/nanoserver1809/docker/Dockerfile
 create mode 100644 release/lts/nanoserver1809/getLatestTag.ps1
 create mode 100644 release/lts/nanoserver1809/meta.json
 create mode 100644 release/lts/ubuntu16.04/docker/Dockerfile
 create mode 100644 release/lts/ubuntu16.04/getLatestTag.ps1
 create mode 100644 release/lts/ubuntu16.04/meta.json
 create mode 100644 release/lts/ubuntu16.04/test-deps/docker/Dockerfile
 create mode 100644 release/lts/ubuntu16.04/test-deps/meta.json
 create mode 100644 release/lts/ubuntu18.04/dependabot/Dockerfile
 create mode 100644 release/lts/ubuntu18.04/docker/Dockerfile
 create mode 100644 release/lts/ubuntu18.04/getLatestTag.ps1
 create mode 100644 release/lts/ubuntu18.04/meta.json
 create mode 100644 release/lts/ubuntu18.04/test-deps/docker/Dockerfile
 create mode 100644 release/lts/ubuntu18.04/test-deps/meta.json
 create mode 100644 release/lts/windowsservercore/dependabot/Dockerfile
 create mode 100755 release/lts/windowsservercore/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore/getLatestTag.ps1
 create mode 100644 release/lts/windowsservercore/meta.json
 delete mode 100644 release/preview/opensuse423/meta.json
 delete mode 100644 release/stable/fedora28/meta.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..c65c0b877
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PowerShell: Build LTS Ubuntu 16.04",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${workspaceFolder}/build.ps1",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "-build",
+                "-Channel",
+                "lts",
+                "-name",
+                "ubuntu16.04"
+            ]
+        }
+    ]
+}
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 6fb3c0e5d..fc3004820 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -44,7 +44,14 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
+      $extraParams = @{}
+      if($env:ACR_NAME)
+      {
+        Write-Host 'Using ACR, will NOT test behavior...'
+        $extraParams.Add('SkipTest',$true)
+      }
+
+      ./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
     displayName: $(ImageName) $(Channel)
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ variables.continueonerror }}
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 964e7c0d9..86353c23b 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -41,6 +41,10 @@ jobs:
           $releaseTag = '$(previewReleaseTag)'
           $version = '$(previewReleaseTag)' -replace '^v', ''
         }
+        'lts' {
+          $releaseTag = '$(ltsReleaseTag)'
+          $version = '$(ltsReleaseTag)' -replace '^v', ''
+        }
         default {
           throw "Unknown channel '$(Channel)'"
         }
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index c588e2e32..b5c8db38c 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -1,4 +1,4 @@
-name: s_$(stableReleaseTag)_p_$(previewReleaseTag)$(Rev:_rr)
+name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 resources:
 - repo: self
@@ -14,11 +14,15 @@ stages:
   - template: releaseStage.yml
     parameters:
       channel: preview
+  - template: releaseStage.yml
+    parameters:
+      channel: lts
 
   - stage: GenerateManifests
     dependsOn:
       - GenerateYaml_stable
       - GenerateYaml_preview
+      - GenerateYaml_lts
     jobs:
     - job: PreviewManifestPhase
       variables:
@@ -65,6 +69,8 @@ stages:
           Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
           $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
           Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
+          $ltsVersion = '$(ltsReleaseTag)' -replace '^v', ''
+          Write-Host "##vso[task.setvariable variable=LtsVersion;]$ltsVersion"
         displayName: 'Set Versions'
 
       - powershell: 'Get-ChildItem env:'
@@ -74,7 +80,7 @@ stages:
         displayName: 'Install Pester'
 
       - powershell: |
-            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
+            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion)
             $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
             Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
                     Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
@@ -86,6 +92,7 @@ stages:
           @{
             'previewReleaseTag' = '$(previewReleaseTag)'
             'stableReleaseTag' = '$(stableReleaseTag)'
+            'ltsReleaseTag' = '$(ltsReleaseTag)'
           }|convertto-json | out-file -FilePath $path -Encoding ascii
           Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
         displayName: Save release Tags
diff --git a/.vsts-ci/vsts-arm-ci.yml b/.vsts-ci/vsts-arm-ci.yml
index 8fb2c477e..6fc4a1e44 100644
--- a/.vsts-ci/vsts-arm-ci.yml
+++ b/.vsts-ci/vsts-arm-ci.yml
@@ -20,4 +20,3 @@ stages:
       acr: OnlyAcr
       useacr: true
       winCiParameter: ''
-      osFilter: Linux
diff --git a/build.ps1 b/build.ps1
index eae8fbc96..e39c63026 100755
--- a/build.ps1
+++ b/build.ps1
@@ -83,7 +83,7 @@ param(
     [string]
     $TagFilter,
 
-    [ValidateSet('stable','preview','servicing','community-stable','community-preview','community-servicing')]
+    [ValidateSet('stable','preview','servicing','community-stable','community-preview','community-servicing','lts')]
     [Parameter(Mandatory, ParameterSetName="TestByName")]
     [Parameter(Mandatory, ParameterSetName="TestAll")]
     [Parameter(ParameterSetName="localBuildByName")]
@@ -118,6 +118,12 @@ param(
     [string]
     $StableVersion,
 
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [Parameter(ParameterSetName="GenerateTagsYaml")]
+    [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
+    [string]
+    $LtsVersion,
+
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -236,6 +242,7 @@ End {
             ServicingVersion = if($Version) {$Version} else {$ServicingVersion}
             PreviewVersion = if($Version) {$Version} else {$PreviewVersion}
             StableVersion = if($Version) {$Version} else {$StableVersion}
+            LtsVersion = if($Version) {$Version} else {$LtsVersion}
         }
 
         # Get Versions
diff --git a/release/lts/alpine38/dependabot/Dockerfile b/release/lts/alpine38/dependabot/Dockerfile
new file mode 100644
index 000000000..1c8c3ded3
--- /dev/null
+++ b/release/lts/alpine38/dependabot/Dockerfile
@@ -0,0 +1 @@
+FROM node:10.15.3-alpine
diff --git a/release/lts/alpine38/docker/Dockerfile b/release/lts/alpine38/docker/Dockerfile
new file mode 100644
index 000000000..bc69ecfe9
--- /dev/null
+++ b/release/lts/alpine38/docker/Dockerfile
@@ -0,0 +1,110 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
+
+# Define arg(s) needed for the From statement
+ARG fromTag=3.8
+ARG imageRepo=alpine
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-lts
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-lts
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.8
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.0 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-lts symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG PS_VERSION=6.2.0
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
+ARG VCS_REF="none"
+
+# Add label last as it's just metadata and uses a lot of parameters
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    description="This Dockerfile will install the latest release of PowerShell." \
+    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+    org.label-schema.name="powershell" \
+    org.label-schema.vendor="PowerShell" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.version=${PS_VERSION} \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/getLatestTag.ps1 b/release/lts/alpine38/getLatestTag.ps1
new file mode 100644
index 000000000..bc836c038
--- /dev/null
+++ b/release/lts/alpine38/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the Alpine image on
+
+# The versions of Alpine we care about, for this dockerfile
+$shortTags = @('3.8')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d$' -OnlyShortTags
diff --git a/release/lts/alpine38/meta.json b/release/lts/alpine38/meta.json
new file mode 100644
index 000000000..2b4b5945b
--- /dev/null
+++ b/release/lts/alpine38/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.8",
+    "tagTemplates": [
+        "lts-alpine-#shorttag#"
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 165
+    }
+}
diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..475dbfdea
--- /dev/null
+++ b/release/lts/alpine38/test-deps/docker/Dockerfile
@@ -0,0 +1,58 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
+
+FROM node:10.15.3-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=10.15.3 \
+    YARN_VERSION=1.13.0 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
+      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/test-deps/meta.json b/release/lts/alpine38/test-deps/meta.json
new file mode 100644
index 000000000..9ac39a65b
--- /dev/null
+++ b/release/lts/alpine38/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.8",
+    "tagTemplates": [
+        "lts-alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 212
+    }
+}
diff --git a/release/preview/opensuse423/dependabot/Dockerfile b/release/lts/alpine39/dependabot/Dockerfile
similarity index 85%
rename from release/preview/opensuse423/dependabot/Dockerfile
rename to release/lts/alpine39/dependabot/Dockerfile
index f3be35b6e..cf026e7c3 100644
--- a/release/preview/opensuse423/dependabot/Dockerfile
+++ b/release/lts/alpine39/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM opensuse/leap:42.3
+FROM alpine:3.10.0
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
new file mode 100644
index 000000000..cdb172917
--- /dev/null
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -0,0 +1,112 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
+
+# Define arg(s) needed for the From statement
+ARG fromTag=3.9
+ARG imageRepo=alpine
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-lts
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG fromTag=3.9
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-lts
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-lts symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG PS_VERSION=7.0.0
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
+ARG VCS_REF="none"
+
+# Add label last as it's just metadata and uses a lot of parameters
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    description="This Dockerfile will install the latest release of PowerShell." \
+    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+    org.label-schema.name="powershell" \
+    org.label-schema.vendor="PowerShell" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.version=${PS_VERSION} \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/getLatestTag.ps1 b/release/lts/alpine39/getLatestTag.ps1
new file mode 100644
index 000000000..bab6f5f80
--- /dev/null
+++ b/release/lts/alpine39/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the Alpine image on
+
+# The versions of Alpine we care about, for this dockerfile
+$shortTags = @('3.9','3.10')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/lts/alpine39/meta.json b/release/lts/alpine39/meta.json
new file mode 100644
index 000000000..077b8bf7d
--- /dev/null
+++ b/release/lts/alpine39/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine",
+    "tagTemplates": [
+        "lts-alpine-#shorttag#"
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 165
+    }
+}
diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..94637a9f1
--- /dev/null
+++ b/release/lts/alpine39/test-deps/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
+
+FROM node:10.15.3-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ARG fromTag=3.9
+
+ENV NODE_VERSION=10.15.3 \
+    YARN_VERSION=1.13.0 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
+      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/test-deps/meta.json b/release/lts/alpine39/test-deps/meta.json
new file mode 100644
index 000000000..5dec6e953
--- /dev/null
+++ b/release/lts/alpine39/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine ${fromTag}",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 212
+    },
+    "TagMapping": {
+        "^.*-alpine-3.9$" : "lts-alpine-3.9",
+        "^.*-alpine-3.10$" : "lts-alpine-3.10"
+    }
+}
diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..f60c2b0e7
--- /dev/null
+++ b/release/lts/arm32v7/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+ARG fromTag=bionic
+ARG imageRepo=arm32v7/ubuntu
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=6.2.3
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-lts
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM ${imageRepo}:${fromTag} AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-lts
+ARG PS_VERSION=6.2.3
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-lts symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/arm32v7/getLatestTag.ps1 b/release/lts/arm32v7/getLatestTag.ps1
new file mode 100644
index 000000000..f4574e134
--- /dev/null
+++ b/release/lts/arm32v7/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the CentOS image on Docker
+
+# The versions of CentOS we care about
+$shortTags = @('bionic')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/lts/arm32v7/meta.json b/release/lts/arm32v7/meta.json
new file mode 100644
index 000000000..04ec4545c
--- /dev/null
+++ b/release/lts/arm32v7/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 18.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "lts-arm32v7-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    }
+}
diff --git a/release/stable/fedora28/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
similarity index 73%
rename from release/stable/fedora28/docker/Dockerfile
rename to release/lts/centos7/docker/Dockerfile
index 1f7d6c64c..ff1f845ff 100644
--- a/release/stable/fedora28/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -1,33 +1,39 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=7
+ARG imageRepo=centos
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
+ARG fromTag=7
+ARG imageRepo=centos
+
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    && dnf install -y \
-	# less is needed for help
-	less \
-    # Needed to run localdef
-        glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-        compat-openssl10 \
-	gssntlmssp \
-    && dnf upgrade-minimal -y --security \
-    && dnf clean all \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # remove powershell package
     && rm /tmp/powershell.rpm \
@@ -45,7 +51,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
 
 # Define args needed only for the labels
 ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/lts/centos7/getLatestTag.ps1
similarity index 57%
rename from release/preview/opensuse423/getLatestTag.ps1
rename to release/lts/centos7/getLatestTag.ps1
index 9d3cfb58f..daaac1cc9 100644
--- a/release/preview/opensuse423/getLatestTag.ps1
+++ b/release/lts/centos7/getLatestTag.ps1
@@ -1,14 +1,14 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-# return objects representing the tags we need to base the opensuse image on Docker
+# return objects representing the tags we need to base the CentOS image on Docker
 
-# The versions of opensuse we care about
-$shortTags = @('42.3')
+# The versions of CentOS we care about
+$shortTags = @('7')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^7$' -OnlyShortTags
diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
new file mode 100644
index 000000000..cac25f71f
--- /dev/null
+++ b/release/lts/centos7/meta.json
@@ -0,0 +1,13 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 7",
+    "tagTemplates": [
+        "lts-centos-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
+}
diff --git a/release/preview/opensuse423/test-deps/docker/Dockerfile b/release/lts/centos7/test-deps/docker/Dockerfile
similarity index 68%
rename from release/preview/opensuse423/test-deps/docker/Dockerfile
rename to release/lts/centos7/test-deps/docker/Dockerfile
index 8e71e61d6..5b9e2fc53 100644
--- a/release/preview/opensuse423/test-deps/docker/Dockerfile
+++ b/release/lts/centos7/test-deps/docker/Dockerfile
@@ -1,28 +1,21 @@
-# Docker image file that describes an OpenSuse 42.3image with PowerShell installed and Test Dependecies
-ARG BaseImage=mcr.microsoft.com/powershell:opensuse-42.3
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
 
 FROM ${BaseImage}
 
-ARG fromTag=42.3
-
 # Install dependencies and clean up
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-         sudo \
-         tar \
-         curl \
-         wget \
-         hostname \
-    # clean package manager cache
-    && zypper clean -a \
-    # remove package manager log file
-    && rm -f /var/log/zypp/history /var/log/zypper.log
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all \
+    && rm -rf /var/cache/yum
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-OpenSUSE-${fromTag}
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
 # Define args needed only for the labels
 ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos7
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
 ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
diff --git a/release/stable/fedora28/test-deps/meta.json b/release/lts/centos7/test-deps/meta.json
similarity index 63%
rename from release/stable/fedora28/test-deps/meta.json
rename to release/lts/centos7/test-deps/meta.json
index 11e335e85..67a1db271 100644
--- a/release/stable/fedora28/test-deps/meta.json
+++ b/release/lts/centos7/test-deps/meta.json
@@ -1,16 +1,15 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora 28",
-    "SkipGssNtlmSspTests": false,
+    "osVersion": "CentOS 7",
     "tagTemplates": [
-        "fedora-#shorttag#"
+        "lts-centos-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
         "test-deps"
     ],
     "TestProperties": {
-        "size": 602
+        "size": 575
     }
 }
diff --git a/release/lts/centos8/dependabot/Dockerfile b/release/lts/centos8/dependabot/Dockerfile
new file mode 100644
index 000000000..5bd787a7a
--- /dev/null
+++ b/release/lts/centos8/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM centos:8
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
new file mode 100644
index 000000000..314e476b1
--- /dev/null
+++ b/release/lts/centos8/docker/Dockerfile
@@ -0,0 +1,75 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=8
+ARG imageRepo=centos
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+ARG fromTag=7
+ARG imageRepo=centos
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/centos8/getLatestTag.ps1 b/release/lts/centos8/getLatestTag.ps1
new file mode 100644
index 000000000..9f6c243eb
--- /dev/null
+++ b/release/lts/centos8/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the CentOS image on Docker
+
+# The versions of CentOS we care about
+$shortTags = @('8')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/lts/centos8/meta.json b/release/lts/centos8/meta.json
new file mode 100644
index 000000000..5b7ad3499
--- /dev/null
+++ b/release/lts/centos8/meta.json
@@ -0,0 +1,13 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "lts-centos-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
+}
diff --git a/release/lts/centos8/test-deps/docker/Dockerfile b/release/lts/centos8/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..5b9e2fc53
--- /dev/null
+++ b/release/lts/centos8/test-deps/docker/Dockerfile
@@ -0,0 +1,39 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/opensuse423/test-deps/meta.json b/release/lts/centos8/test-deps/meta.json
similarity index 61%
rename from release/preview/opensuse423/test-deps/meta.json
rename to release/lts/centos8/test-deps/meta.json
index a42c27582..823ef03c1 100644
--- a/release/preview/opensuse423/test-deps/meta.json
+++ b/release/lts/centos8/test-deps/meta.json
@@ -1,16 +1,15 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "OpenSuse 42.3",
-    "SkipGssNtlmSspTests": true,
+    "osVersion": "CentOS 8",
     "tagTemplates": [
-        "preview-opensuse-#shorttag#"
+        "lts-centos-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
         "test-deps"
     ],
     "TestProperties": {
-        "size": 536
+        "size": 575
     }
 }
diff --git a/release/lts/debian10/dependabot/Dockerfile b/release/lts/debian10/dependabot/Dockerfile
new file mode 100644
index 000000000..934a2d9c0
--- /dev/null
+++ b/release/lts/debian10/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM debian:10
diff --git a/release/preview/opensuse423/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
similarity index 67%
rename from release/preview/opensuse423/docker/Dockerfile
rename to release/lts/debian10/docker/Dockerfile
index 287c8d157..2480a256b 100644
--- a/release/preview/opensuse423/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -1,19 +1,17 @@
-# Docker image file that describes an OpenSuse 42.3 image with PowerShell installed from tar.gz
-# Implemented in two stages, one that downloads and uncompresses the tar.gz
-# The next stage simply copies the files from the first stage,
-# effectively removing the tar.gz and packages that are not needed from the final image.
-
-# Define arg(s) needed for the From statement
-ARG fromTag=42.3
-ARG imageRepo=opensuse/leap
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=buster-slim
+ARG imageRepo=debian
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-rc.1
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
+ARG PS_INSTALL_VERSION=7-lts
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
 
 # define the folder we will be installing PowerShell to
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
@@ -21,29 +19,20 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
 
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive
-
-RUN zypper --non-interactive install \
-        tar
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
 # Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
-# ------ Second stage ------
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM ${imageRepo}:${fromTag}
 
-ARG fromTag=42.3
+ARG PS_VERSION=7.0.0
+ARG PS_INSTALL_VERSION=7-lts
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
 # Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
+ARG PS_INSTALL_VERSION=7-lts
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
     # Define ENVs for Localization/Globalization
@@ -52,26 +41,40 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OpenSUSE-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
 
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-        glibc-locale \
-        glibc-i18ndata \
-        libicu \
-        openssl \
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # less is required for help in powershell
         less \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # clean package manager cache
-    && zypper clean -a \
-    # remove package manager log file
-    && rm -f /var/log/zypp/history /var/log/zypper.log \
+    # Create the pwsh-lts symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
@@ -85,11 +88,9 @@ RUN zypper --non-interactive update --skip-interactive \
           }"
 
 # Define args needed only for the labels
-ARG PS_VERSION=6.2.0-preview.3
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:opensuse-42.3
 ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10
 
-# Add label last as it's just metadata and uses a lot of parameters
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
       description="This Dockerfile will install the latest release of PowerShell." \
@@ -98,12 +99,14 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
       org.label-schema.name="powershell" \
       org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
       org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
       org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
       org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
 
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian10/getLatestTag.ps1 b/release/lts/debian10/getLatestTag.ps1
new file mode 100644
index 000000000..f262fed60
--- /dev/null
+++ b/release/lts/debian10/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('buster-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'buster-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '10' -SkipShortTagFilter
diff --git a/release/lts/debian10/meta.json b/release/lts/debian10/meta.json
new file mode 100644
index 000000000..7efa5faf4
--- /dev/null
+++ b/release/lts/debian10/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 10",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/lts/debian10/test-deps/docker/Dockerfile b/release/lts/debian10/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..35918f757
--- /dev/null
+++ b/release/lts/debian10/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-10
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/debian10/test-deps/meta.json b/release/lts/debian10/test-deps/meta.json
new file mode 100644
index 000000000..48822372d
--- /dev/null
+++ b/release/lts/debian10/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 10",
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/lts/debian11/dependabot/Dockerfile b/release/lts/debian11/dependabot/Dockerfile
new file mode 100644
index 000000000..8a60bc3b0
--- /dev/null
+++ b/release/lts/debian11/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM debian:11
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
new file mode 100644
index 000000000..21dcfb135
--- /dev/null
+++ b/release/lts/debian11/docker/Dockerfile
@@ -0,0 +1,112 @@
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=bullseye-slim
+ARG imageRepo=debian
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.3
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-lts
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG PS_VERSION=7.0.0
+ARG PS_INSTALL_VERSION=7-lts
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-lts
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-lts symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/debian11/getLatestTag.ps1 b/release/lts/debian11/getLatestTag.ps1
new file mode 100644
index 000000000..f19797bb9
--- /dev/null
+++ b/release/lts/debian11/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('bullseye-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
new file mode 100644
index 000000000..f0b024143
--- /dev/null
+++ b/release/lts/debian11/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 11 (Testing)",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/lts/debian11/test-deps/docker/Dockerfile b/release/lts/debian11/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..af918cf6e
--- /dev/null
+++ b/release/lts/debian11/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-11
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/debian11/test-deps/meta.json b/release/lts/debian11/test-deps/meta.json
new file mode 100644
index 000000000..05b99bc75
--- /dev/null
+++ b/release/lts/debian11/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 11 (Testing)",
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
new file mode 100644
index 000000000..0dbaf77f9
--- /dev/null
+++ b/release/lts/debian9/docker/Dockerfile
@@ -0,0 +1,78 @@
+# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=stretch-slim
+ARG imageRepo=debian
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/debian9/getLatestTag.ps1 b/release/lts/debian9/getLatestTag.ps1
new file mode 100644
index 000000000..4ceee128f
--- /dev/null
+++ b/release/lts/debian9/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('stretch-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/lts/debian9/meta.json b/release/lts/debian9/meta.json
new file mode 100644
index 000000000..b57a2014b
--- /dev/null
+++ b/release/lts/debian9/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb",
+    "osVersion": "Debian 9",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
diff --git a/release/lts/debian9/test-deps/docker/Dockerfile b/release/lts/debian9/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..0abc4fc86
--- /dev/null
+++ b/release/lts/debian9/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian 9image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-9
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/debian9/test-deps/meta.json b/release/lts/debian9/test-deps/meta.json
new file mode 100644
index 000000000..3e5edb741
--- /dev/null
+++ b/release/lts/debian9/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 9",
+    "tagTemplates": [
+        "lts-debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/lts/fedora/dependabot/Dockerfile b/release/lts/fedora/dependabot/Dockerfile
new file mode 100644
index 000000000..2b4d6bd3e
--- /dev/null
+++ b/release/lts/fedora/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM fedora:30
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
new file mode 100644
index 000000000..0c4d7c716
--- /dev/null
+++ b/release/lts/fedora/docker/Dockerfile
@@ -0,0 +1,110 @@
+# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=28
+ARG imageRepo=fedora
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+ARG fromTag=28
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && dnf install -y /tmp/powershell.rpm \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && echo "starting misc packages" \
+    && dnf install -y \
+    # less is needed for help
+      less \
+    # Needed to run localdef
+      glibc-locale-source \
+    # Invoke-WebRequest doesn't work correctly without this
+      compat-openssl10 \
+      ca-certificates \
+      gssntlmssp \
+    && echo "end - misc packages" \
+    && echo "starting FEDORA-2019-27e7b92407" \
+    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
+    # to do this, upgrade libmodulemd1, if it is installed
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          try { \$packageList = dnf list installed libmodulemd1} \
+          catch {}; \
+          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
+          if(\$module) { \
+            Write-Host '******* Patching *********'; \
+            dnf upgrade -y libmodulemd1 \
+          }" \
+    && echo "end - FEDORA-2019-27e7b92407" \
+    # This installs most security advisories
+    && echo "starting upgrade minimal" \
+    && dnf upgrade-minimal -y --security \
+    && echo "end - upgrade minimal" \
+    # query and install any remaining security advisories
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          Write-Host '******* Getting security advisory list *********'; \
+          (dnf updateinfo list -q --security) |  \
+              Foreach-Object { \
+                  \$advisory=(\$_ -split ' ')[0]; \
+                  Write-Host '******* Patching *********'; \
+                  Write-Host \$advisory; \
+                  Write-Host '************************'; \
+                  dnf upgrade -y --advisory=\$advisory \
+              }" \
+    && echo "verifying all security advisories are installed..." \
+    && dnf updateinfo list -q --security \
+    && echo "end - verifying all security advisories are installed..." \
+    && dnf clean all \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/fedora28/getLatestTag.ps1 b/release/lts/fedora/getLatestTag.ps1
similarity index 91%
rename from release/stable/fedora28/getLatestTag.ps1
rename to release/lts/fedora/getLatestTag.ps1
index 5e8290dce..c9ad27d2d 100644
--- a/release/stable/fedora28/getLatestTag.ps1
+++ b/release/lts/fedora/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the fedora image on
 
 # The versions of fedora we care about
-$shortTags = @('28')
+$shortTags = @('30')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^28$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/lts/fedora/meta.json b/release/lts/fedora/meta.json
new file mode 100644
index 000000000..2daa43419
--- /dev/null
+++ b/release/lts/fedora/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "Fedora",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-fedora-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/stable/fedora28/test-deps/docker/Dockerfile b/release/lts/fedora/test-deps/docker/Dockerfile
similarity index 94%
rename from release/stable/fedora28/test-deps/docker/Dockerfile
rename to release/lts/fedora/test-deps/docker/Dockerfile
index d5a9153ec..e0004d29a 100644
--- a/release/stable/fedora28/test-deps/docker/Dockerfile
+++ b/release/lts/fedora/test-deps/docker/Dockerfile
@@ -3,6 +3,8 @@ ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
 
 FROM ${BaseImage}
 
+ARG fromTag=28
+
 # Install dependencies and clean up
 RUN dnf install -y \
         sudo \
@@ -13,10 +15,12 @@ RUN dnf install -y \
         procps-ng \
     && dnf clean all
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
+
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/lts/fedora/test-deps/meta.json b/release/lts/fedora/test-deps/meta.json
new file mode 100644
index 000000000..3a070f03e
--- /dev/null
+++ b/release/lts/fedora/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Fedora ${fromTag}",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 632
+    },
+    "TagMapping": {
+        "^.*-fedora-30$" : "lts-fedora-30"
+    }
+}
diff --git a/release/lts/nanoserver/docker/Dockerfile b/release/lts/nanoserver/docker/Dockerfile
new file mode 100755
index 000000000..7feb50cfe
--- /dev/null
+++ b/release/lts/nanoserver/docker/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG fromTag=1709
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:${fromTag}
+
+ARG fromTag=1709
+
+ARG VCS_REF="none"
+ARG PS_VERSION=6.1.0-rc.1
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# Set the path
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver/getLatestTag.ps1 b/release/lts/nanoserver/getLatestTag.ps1
new file mode 100644
index 000000000..7b8017d27
--- /dev/null
+++ b/release/lts/nanoserver/getLatestTag.ps1
@@ -0,0 +1,30 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the nanoserver image on
+
+
+param(
+    [Switch]
+    $CI,
+    # The versions of nanoserver we care about
+    [string[]]
+    $ShortTags
+)
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+if(!$CI.IsPresent)
+{
+    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
+}
+else {
+    # This is not supported for nanoserver so don't build in production but try building it as a CI test for the Dockerfile
+    $shortTags = @('latest')
+
+    # The \d{4,} part of the regex is because the API is returning tags which are 3 digits and older than the 4 digit tags
+    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '10\.0\.14393\.\d{4,}$' -SkipShortTagFilter -Mcr
+}
diff --git a/release/lts/nanoserver/meta.json b/release/lts/nanoserver/meta.json
new file mode 100644
index 000000000..2eee0d0f9
--- /dev/null
+++ b/release/lts/nanoserver/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version ${fromTag}",
+    "shortTags": [
+        {"Tag": "1803"}
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "TestProperties": {
+        "size": 1
+    }
+}
diff --git a/release/lts/nanoserver1809/dependabot/Dockerfile b/release/lts/nanoserver1809/dependabot/Dockerfile
new file mode 100644
index 000000000..f5c61be5e
--- /dev/null
+++ b/release/lts/nanoserver1809/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM mcr.microsoft.com/windows/nanoserver:1903
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
new file mode 100755
index 000000000..c92e961e0
--- /dev/null
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -0,0 +1,105 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG fromTag=1709
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:${fromTag}
+
+ARG fromTag=1709
+
+ARG VCS_REF="none"
+ARG PS_VERSION=6.2.0-rc.1
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1809/getLatestTag.ps1 b/release/lts/nanoserver1809/getLatestTag.ps1
new file mode 100644
index 000000000..2c7ce394f
--- /dev/null
+++ b/release/lts/nanoserver1809/getLatestTag.ps1
@@ -0,0 +1,21 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the nanoserver image on
+
+
+param(
+    [Switch]
+    $CI,
+    # The versions of nanoserver we care about
+    [string[]]
+    $ShortTags
+)
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
+
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
new file mode 100644
index 000000000..eda76e6a8
--- /dev/null
+++ b/release/lts/nanoserver1809/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version ${fromTag}",
+    "shortTags": [
+        {"Tag": "1809"},
+        {"Tag": "1903"}
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    }
+}
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
new file mode 100644
index 000000000..7e7a14933
--- /dev/null
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -0,0 +1,75 @@
+# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=16.04
+ARG imageRepo=ubuntu
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0-rc.1
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu16.04/getLatestTag.ps1 b/release/lts/ubuntu16.04/getLatestTag.ps1
new file mode 100644
index 000000000..6ef600d39
--- /dev/null
+++ b/release/lts/ubuntu16.04/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the xenial image on
+
+# The versions of xenial we care about
+$shortTags = @('xenial')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'xenial-\d{8}[\.\d{1}]?' -AlternativeShortTag '16.04'
diff --git a/release/lts/ubuntu16.04/meta.json b/release/lts/ubuntu16.04/meta.json
new file mode 100644
index 000000000..3b9123fa4
--- /dev/null
+++ b/release/lts/ubuntu16.04/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "osVersion": "Ubuntu 16.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 395
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..cd956e14d
--- /dev/null
+++ b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
@@ -0,0 +1,42 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu16.04/test-deps/meta.json b/release/lts/ubuntu16.04/test-deps/meta.json
new file mode 100644
index 000000000..8bd139c7d
--- /dev/null
+++ b/release/lts/ubuntu16.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 16.04",
+    "tagTemplates": [
+        "lts-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 399
+    }
+}
diff --git a/release/lts/ubuntu18.04/dependabot/Dockerfile b/release/lts/ubuntu18.04/dependabot/Dockerfile
new file mode 100644
index 000000000..2f686eca8
--- /dev/null
+++ b/release/lts/ubuntu18.04/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM ubuntu:18.04
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
new file mode 100644
index 000000000..f4c23e308
--- /dev/null
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -0,0 +1,75 @@
+# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=18.04
+ARG imageRepo=ubuntu
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0-rc.1
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/getLatestTag.ps1 b/release/lts/ubuntu18.04/getLatestTag.ps1
new file mode 100644
index 000000000..40aa9aaf9
--- /dev/null
+++ b/release/lts/ubuntu18.04/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the beaver image on
+
+# The versions of beaver we care about
+$shortTags = @('bionic')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'bionic-\d{8}[\.\d{1}]?' -AlternativeShortTag '18.04'
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
new file mode 100644
index 000000000..247c127a5
--- /dev/null
+++ b/release/lts/ubuntu18.04/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "osVersion": "Ubuntu 18.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "lts-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..629df4a11
--- /dev/null
+++ b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
@@ -0,0 +1,42 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/test-deps/meta.json b/release/lts/ubuntu18.04/test-deps/meta.json
new file mode 100644
index 000000000..3e42dc92f
--- /dev/null
+++ b/release/lts/ubuntu18.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 18.04",
+    "tagTemplates": [
+        "lts-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/lts/windowsservercore/dependabot/Dockerfile b/release/lts/windowsservercore/dependabot/Dockerfile
new file mode 100644
index 000000000..8521751a2
--- /dev/null
+++ b/release/lts/windowsservercore/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM mcr.microsoft.com/windows/servercore:1903
diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore/docker/Dockerfile
new file mode 100755
index 000000000..748f31242
--- /dev/null
+++ b/release/lts/windowsservercore/docker/Dockerfile
@@ -0,0 +1,85 @@
+# escape=`
+ARG fromTag=latest
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:${fromTag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+CMD ["pwsh.exe"]
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
+ARG VCS_REF="none"
+ARG PS_VERSION=7.0.0
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
diff --git a/release/lts/windowsservercore/getLatestTag.ps1 b/release/lts/windowsservercore/getLatestTag.ps1
new file mode 100644
index 000000000..cf9142c8c
--- /dev/null
+++ b/release/lts/windowsservercore/getLatestTag.ps1
@@ -0,0 +1,19 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the nanoserver image on
+
+param(
+    [Switch]
+    $CI
+)
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath -Force
+
+# The versions of nanoserver we care about
+$shortTags = @('1803','1809','1903')
+
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/lts/windowsservercore/meta.json b/release/lts/windowsservercore/meta.json
new file mode 100644
index 000000000..d92c16abe
--- /dev/null
+++ b/release/lts/windowsservercore/meta.json
@@ -0,0 +1,12 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version ${fromTag}",
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    }
+}
diff --git a/release/preview/fedora/getLatestTag.ps1 b/release/preview/fedora/getLatestTag.ps1
index 43a61d207..c9ad27d2d 100644
--- a/release/preview/fedora/getLatestTag.ps1
+++ b/release/preview/fedora/getLatestTag.ps1
@@ -4,7 +4,7 @@
 # return objects representing the tags we need to base the fedora image on
 
 # The versions of fedora we care about
-$shortTags = @('28','29','30')
+$shortTags = @('30')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
index 5d7da871c..ae99ee413 100644
--- a/release/preview/fedora/test-deps/meta.json
+++ b/release/preview/fedora/test-deps/meta.json
@@ -14,8 +14,6 @@
         "size": 632
     },
     "TagMapping": {
-        "^.*-fedora-28$" : "preview-fedora-28",
-        "^.*-fedora-29$" : "preview-fedora-29",
         "^.*-fedora-30$" : "preview-fedora-30"
     }
 }
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index 8396b1ce0..a72b8d17a 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -4,7 +4,8 @@
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
         {"Tag": "1809"},
-        {"Tag": "1903"}
+        {"Tag": "1903"},
+        {"Tag": "1909"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/preview/opensuse423/meta.json b/release/preview/opensuse423/meta.json
deleted file mode 100644
index 1de7ee4f7..000000000
--- a/release/preview/opensuse423/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "OpenSuse 42.3",
-    "SkipGssNtlmSspTests": true,
-    "tagTemplates": [
-        "#psversion#-opensuse-#tag#",
-        "preview-opensuse-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 524
-    }
-}
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
index cf9142c8c..149532755 100644
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ b/release/preview/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903')
+$shortTags = @('1803','1809','1903','1909')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/fedora28/meta.json b/release/stable/fedora28/meta.json
deleted file mode 100644
index e7cec1369..000000000
--- a/release/stable/fedora28/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora 28",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-fedora-#tag#",
-        "fedora-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 586
-    }
-}
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index 52fb86d9a..0dd88ece6 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -4,7 +4,8 @@
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
         {"Tag": "1809"},
-        {"Tag": "1903"}
+        {"Tag": "1903"},
+        {"Tag": "1909"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
index cf9142c8c..149532755 100644
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ b/release/stable/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903')
+$shortTags = @('1803','1809','1903','1909')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 690a5267a..4137389dd 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -412,17 +412,32 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
         BeforeAll {
             $permissionsTestCases = @(
                 $script:linuxContainerRunTests | ForEach-Object {
+                    $path = '/opt/microsoft/powershell/6/pwsh'
+                    switch -RegEx ($_.Channel)
+                    {
+                        'stable' {
+                            $path = '/opt/microsoft/powershell/6/pwsh'
+                        }
+                        'lts' {
+                            $path = '/opt/microsoft/powershell/7-lts/pwsh'
+                        }
+                        'preview' {
+                            $path = '/opt/microsoft/powershell/7-preview/pwsh'
+                        }
+                    }
+
                     $Arm32 = [bool] $_.TestProperties.Arm32
                     @{
                         Name = $_.Name
                         Channel = $_.Channel
                         Arm32 = $Arm32
+                        Path = $path
                     }
                 }
             )
         }
 
-        it "pwsh should have execute permissions for all in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
+        it "pwsh should be at <Path> in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
@@ -431,19 +446,41 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 $Channel,
 
                 [Bool]
-                $Arm32
+                $Arm32,
+
+                [string]
+                $Path
             )
 
             if($Arm32)
             {
-                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+                Set-ItResult -Pending -Because "Arm32 is flaky on QEMU"
             }
 
-            $path = '/opt/microsoft/powershell/6/pwsh'
+            $paths = @(Get-DockerCommandSource -Name $name -Command 'pwsh')
+            $paths.count | Should -BeGreaterOrEqual 1
+            $pwshPath = $paths | Where-Object { $_ -like '*microsoft*' }
+            $pwshPath | Should -Be $Path
+        }
+
+        it "pwsh should have execute permissions for all in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32,
+
+                [string]
+                $Path
+            )
 
-            if($Channel -eq 'preview')
+            if($Arm32)
             {
-                $path = '/opt/microsoft/powershell/7-preview/pwsh'
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
             }
 
             $permissions = Get-DockerImagePwshPermissions -Name $name -Path $path
@@ -459,7 +496,10 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 $Channel,
 
                 [Bool]
-                $Arm32
+                $Arm32,
+
+                [string]
+                $Path
             )
 
             if($Arm32)
@@ -467,13 +507,6 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
             }
 
-            $path = '/opt/microsoft/powershell/6/pwsh'
-
-            if($Channel -eq 'preview')
-            {
-                $path = '/opt/microsoft/powershell/7-preview/pwsh'
-            }
-
             $permissions = Get-DockerImagePwshPermissions -Name $name -Path $path
             $permissions | Should -Match '^[\-rwx]{4}[\-rwx]{3}[\-rx]{3}$' -Because 'Others should not be able to write'
         }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 82af77967..eb07f28b1 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -16,17 +16,24 @@ function Get-PowerShellVersion
         [Parameter(Mandatory, ParameterSetName='Servicing', HelpMessage="Gets the servicing version.  Without this it gets the current stable version.")]
         [switch] $Servicing,
 
+        [Parameter(Mandatory, ParameterSetName="ExplicitVersionLts", HelpMessage="Gets the preview version.  Without this it gets the current stable version.")]
+        [Parameter(Mandatory, ParameterSetName='Lts', HelpMessage="Gets the lts version.  Without this it gets the current stable version.")]
+        [switch] $Lts,
+
         [Parameter(ParameterSetName="LookupVersion",HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [Parameter(ParameterSetName="ExplicitVersion",HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [Parameter(ParameterSetName="ExplicitVersionPreview",HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [Parameter(ParameterSetName="ExplicitVersionServicing",HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
+        [Parameter(ParameterSetName="ExplicitVersionLts", HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [Parameter(ParameterSetName='Servicing', HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [Parameter(ParameterSetName='Preview', HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
+        [Parameter(ParameterSetName='Lts', HelpMessage="Gets the linux package (docker tags use the standard format) format of the version.  This only applies to preview versions, but is always safe to use for linux packages.")]
         [switch] $Linux,
 
         [Parameter(Mandatory,ParameterSetName="ExplicitVersion", HelpMessage="Don't lookup version, just transform this standardized version based on the other parameters.")]
         [Parameter(Mandatory,ParameterSetName="ExplicitVersionServicing", HelpMessage="Don't lookup version, just transform this standardized version based on the other parameters.")]
         [Parameter(Mandatory,ParameterSetName="ExplicitVersionPreview", HelpMessage="Don't lookup version, just transform this standardized version based on the other parameters.")]
+        [Parameter(Mandatory, ParameterSetName="ExplicitVersionLts", HelpMessage="Don't lookup version, just transform this standardized version based on the other parameters.")]
         [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
         [string]
         $Version
@@ -41,6 +48,15 @@ function Get-PowerShellVersion
         elseif ($Servicing.IsPresent) {
             $metaData.ServicingReleaseTag
         }
+        elseif ($Lts.IsPresent) {
+            $ltsReleaseTag = $metaData.LtsReleaseTag
+            if (-not $ltsReleaseTag) {
+                $metaData.PreviewReleaseTag
+            }
+            else {
+                $ltsReleaseTag
+            }
+        }
         else {
             $metaData.StableReleaseTag
         }
@@ -63,7 +79,7 @@ function Get-ImageList
 {
     param(
         [Parameter(HelpMessage="Filters returned list to stable or preview images. Default to all images.")]
-        [ValidateSet('stable','preview','servicing','all','community-stable')]
+        [ValidateSet('stable','preview','servicing','all','community-stable','lts')]
         [string[]]
         $Channel='all'
     )
@@ -71,6 +87,7 @@ function Get-ImageList
     # Get the names of the builds.
     $releasePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\release'
     $stablePath = Join-Path -Path $releasePath -ChildPath 'stable'
+    $ltsPath = Join-Path -Path $releasePath -ChildPath 'lts'
     $previewPath = Join-Path -Path $releasePath -ChildPath 'preview'
     $servicingPath = Join-Path -Path $releasePath -ChildPath 'servicing'
     $communityStablePath = Join-Path -Path $releasePath -ChildPath 'community-stable'
@@ -85,6 +102,11 @@ function Get-ImageList
         Get-ChildItem -Path $servicingPath -Directory | Select-Object -ExpandProperty Name | Write-Output
     }
 
+    if ($Channel -in 'lts', 'all')
+    {
+        Get-ChildItem -Path $ltsPath -Directory | Select-Object -ExpandProperty Name | Write-Output
+    }
+
     if ($Channel -in 'preview', 'all')
     {
         Get-ChildItem -Path $previewPath -Directory | Select-Object -ExpandProperty Name | Where-Object { $dockerFileNames -notcontains $_ } | Write-Output
@@ -276,10 +298,13 @@ function Get-Versions
         $PreviewVersion,
 
         [string]
-        $StableVersion
+        $StableVersion,
+
+        [string]
+        $LtsVersion
     )
 
-    Write-Verbose "Getting Version for $Channel - servicing: $ServicingVersion; Preview: $PreviewVersion; stable: $stableVersion"
+    Write-Verbose "Getting Version for $Channel - servicing: $ServicingVersion; Preview: $PreviewVersion; stable: $stableVersion; stable: $ltsVersion"
 
     $versionExtraParams = @{}
 
@@ -293,6 +318,14 @@ function Get-Versions
             $windowsVersion = Get-PowerShellVersion -Servicing @versionExtraParams
             $linuxVersion = Get-PowerShellVersion -Linux -Servicing @versionExtraParams
         }
+        'lts$' {
+            if($LtsVersion){
+                $versionExtraParams['Version'] = $LtsVersion
+            }
+
+            $windowsVersion = Get-PowerShellVersion -Lts @versionExtraParams
+            $linuxVersion = Get-PowerShellVersion -Lts -Linux @versionExtraParams
+        }
         'preview$' {
             if($PreviewVersion){
                 $versionExtraParams['Version'] = $PreviewVersion
@@ -606,7 +639,7 @@ function Get-TestParams
             $packageUrl = [System.UriBuilder]::new($sasData.sasBase)
 
             $previewTag = ''
-            if($actualChannel -like '*preview*')
+            if($psversion -like '*-*')
             {
                 $previewTag = '-preview'
             }
@@ -632,7 +665,7 @@ function Get-TestParams
             $packageUrl = [System.UriBuilder]::new('https://github.com/PowerShell/PowerShell/releases/download/')
 
             $previewTag = ''
-            if($actualChannel -like '*preview*')
+            if($psversion -like '*-*')
             {
                 $previewTag = '-preview'
             }
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 988ef49a6..af4406072 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -14,6 +14,9 @@ stages:
   - template: .vsts-ci/stage.yml
     parameters:
       channel: preview
+  - template: .vsts-ci/stage.yml
+    parameters:
+      channel: lts
   - template: .vsts-ci/stage.yml
     parameters:
       channel: community-stable
@@ -31,7 +34,7 @@ stages:
       - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
         displayName: Set Build Name for Non-PR
         condition: ne(variables['Build.Reason'], 'PullRequest')
-      - pwsh: ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, servicing
+      - pwsh: ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, servicing, lts
         displayName: Check for Duplicate Tags
         condition: succeededOrFailed()
 
@@ -48,6 +51,7 @@ stages:
         displayName: 'Scan for secrets'
         inputs:
           debugMode: false
+          toolMajorVersion: V2
 
       - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
         displayName: 'Publish Secret Scan Logs to Build Artifacts'

From 11303d11346d0f2b79cdb351f4705e31a6a815eb Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 28 Feb 2020 11:12:36 -0800
Subject: [PATCH 046/354] Merge 7.0.0 release changes (#382)

Co-authored-by: Andrew <anmenaga@microsoft.com>
Co-authored-by: Reece Dunham <me@rdil.rocks>
---
 .dependabot/config.yml                        |  24 ++--
 .vsts-ci/releasebuild.yml                     |   2 +-
 .../preview/alpine311/dependabot/Dockerfile   |   6 +
 release/preview/alpine311/docker/Dockerfile   | 112 ++++++++++++++++++
 release/preview/alpine311/getLatestTag.ps1    |  14 +++
 release/preview/alpine311/meta.json           |  15 +++
 .../alpine311/test-deps/docker/Dockerfile     |  60 ++++++++++
 release/preview/alpine311/test-deps/meta.json |  19 +++
 .../alpine38/test-deps/docker/Dockerfile      |   6 +-
 .../alpine39/test-deps/docker/Dockerfile      |   6 +-
 .../debian9/test-deps/docker/Dockerfile       |   2 +-
 release/servicing/alpine/docker/Dockerfile    |   6 +-
 release/servicing/alpine/meta.json            |   6 +-
 release/servicing/arm32v7/docker/Dockerfile   |   2 +-
 release/servicing/centos7/docker/Dockerfile   |  11 +-
 release/servicing/centos7/meta.json           |   6 +-
 release/servicing/debian9/docker/Dockerfile   |   5 +-
 release/servicing/debian9/getLatestTag.ps1    |   4 +-
 release/servicing/debian9/meta.json           |   6 +-
 release/servicing/fedora28/meta.json          |  10 --
 .../servicing/nanoserver/docker/Dockerfile    |   4 +-
 release/servicing/nanoserver/meta.json        |   7 +-
 .../nanoserver1809/docker/Dockerfile          |  21 +++-
 .../servicing/nanoserver1809/getLatestTag.ps1 |   3 +-
 release/servicing/nanoserver1809/meta.json    |   9 +-
 .../servicing/opensuse423/docker/Dockerfile   |   6 +-
 release/servicing/opensuse423/meta.json       |   1 +
 .../servicing/ubuntu16.04/docker/Dockerfile   |   2 +-
 release/servicing/ubuntu16.04/meta.json       |   6 +-
 .../servicing/ubuntu18.04/docker/Dockerfile   |   2 +-
 release/servicing/ubuntu18.04/meta.json       |   6 +-
 .../windowsservercore/docker/Dockerfile       |   4 +-
 .../windowsservercore/getLatestTag.ps1        |   4 +-
 release/servicing/windowsservercore/meta.json |   5 +-
 release/stable/alpine38/dependabot/Dockerfile |   1 +
 .../{alpine => alpine38}/docker/Dockerfile    |  12 +-
 .../{alpine => alpine38}/getLatestTag.ps1     |   6 +-
 release/stable/{alpine => alpine38}/meta.json |   0
 .../test-deps/docker/Dockerfile               |   9 +-
 .../{alpine => alpine38}/test-deps/meta.json  |   0
 release/stable/alpine39/dependabot/Dockerfile |   6 +
 release/stable/alpine39/docker/Dockerfile     | 110 +++++++++++++++++
 release/stable/alpine39/getLatestTag.ps1      |  14 +++
 release/stable/alpine39/meta.json             |  15 +++
 .../alpine39/test-deps/docker/Dockerfile      |  60 ++++++++++
 release/stable/alpine39/test-deps/meta.json   |  20 ++++
 release/stable/arm32v7/docker/Dockerfile      |  96 +++++++++++++--
 release/stable/arm32v7/getLatestTag.ps1       |  14 +++
 release/stable/arm32v7/meta.json              |  17 +++
 release/stable/centos7/meta.json              |   2 +-
 .../centos7/test-deps/docker/Dockerfile       |   3 +-
 release/stable/centos8/dependabot/Dockerfile  |   6 +
 .../centos8}/docker/Dockerfile                |  46 ++++---
 .../{opensuse423 => centos8}/getLatestTag.ps1 |   8 +-
 release/stable/centos8/meta.json              |  14 +++
 .../test-deps/docker/Dockerfile               |  27 ++---
 .../test-deps/meta.json                       |   7 +-
 release/stable/debian10/dependabot/Dockerfile |   6 +
 release/stable/debian10/docker/Dockerfile     | 110 +++++++++++++++++
 release/stable/debian10/getLatestTag.ps1      |  14 +++
 release/stable/debian10/meta.json             |  16 +++
 .../debian10/test-deps/docker/Dockerfile      |  43 +++++++
 release/stable/debian10/test-deps/meta.json   |  16 +++
 release/stable/debian11/dependabot/Dockerfile |   6 +
 .../docker/Dockerfile                         |  88 +++++++-------
 release/stable/debian11/getLatestTag.ps1      |  14 +++
 release/stable/debian11/meta.json             |  16 +++
 .../debian11/test-deps/docker/Dockerfile      |  43 +++++++
 release/stable/debian11/test-deps/meta.json   |  16 +++
 release/stable/debian9/meta.json              |   2 +-
 .../debian9/test-deps/docker/Dockerfile       |   4 +-
 release/stable/fedora/dependabot/Dockerfile   |   6 +
 release/stable/fedora/docker/Dockerfile       | 111 +++++++++++++++++
 .../fedora}/getLatestTag.ps1                  |   4 +-
 release/stable/fedora/meta.json               |  15 +++
 .../stable/fedora/test-deps/docker/Dockerfile |  43 +++++++
 release/stable/fedora/test-deps/meta.json     |  19 +++
 .../stable/nanoserver1809/docker/Dockerfile   |  41 ++++---
 release/stable/opensuse423/meta.json          |  15 ---
 release/stable/ubuntu16.04/docker/Dockerfile  |   3 +-
 release/stable/ubuntu16.04/meta.json          |   2 +-
 release/stable/ubuntu18.04/docker/Dockerfile  |   3 +-
 release/stable/ubuntu18.04/meta.json          |   2 +-
 .../windowsservercore/docker/Dockerfile       |   3 +-
 tests/container.tests.ps1                     |   2 +-
 vsts-ci.yml                                   |   2 +-
 86 files changed, 1336 insertions(+), 224 deletions(-)
 create mode 100644 release/preview/alpine311/dependabot/Dockerfile
 create mode 100644 release/preview/alpine311/docker/Dockerfile
 create mode 100644 release/preview/alpine311/getLatestTag.ps1
 create mode 100644 release/preview/alpine311/meta.json
 create mode 100644 release/preview/alpine311/test-deps/docker/Dockerfile
 create mode 100644 release/preview/alpine311/test-deps/meta.json
 delete mode 100644 release/servicing/fedora28/meta.json
 create mode 100644 release/stable/alpine38/dependabot/Dockerfile
 rename release/stable/{alpine => alpine38}/docker/Dockerfile (95%)
 rename release/stable/{alpine => alpine38}/getLatestTag.ps1 (72%)
 rename release/stable/{alpine => alpine38}/meta.json (100%)
 rename release/stable/{alpine => alpine38}/test-deps/docker/Dockerfile (93%)
 rename release/stable/{alpine => alpine38}/test-deps/meta.json (100%)
 create mode 100644 release/stable/alpine39/dependabot/Dockerfile
 create mode 100644 release/stable/alpine39/docker/Dockerfile
 create mode 100644 release/stable/alpine39/getLatestTag.ps1
 create mode 100644 release/stable/alpine39/meta.json
 create mode 100644 release/stable/alpine39/test-deps/docker/Dockerfile
 create mode 100644 release/stable/alpine39/test-deps/meta.json
 create mode 100644 release/stable/arm32v7/getLatestTag.ps1
 create mode 100644 release/stable/arm32v7/meta.json
 create mode 100644 release/stable/centos8/dependabot/Dockerfile
 rename release/{servicing/fedora28 => stable/centos8}/docker/Dockerfile (70%)
 rename release/stable/{opensuse423 => centos8}/getLatestTag.ps1 (57%)
 create mode 100644 release/stable/centos8/meta.json
 rename release/stable/{opensuse423 => centos8}/test-deps/docker/Dockerfile (70%)
 rename release/stable/{opensuse423 => centos8}/test-deps/meta.json (62%)
 create mode 100644 release/stable/debian10/dependabot/Dockerfile
 create mode 100644 release/stable/debian10/docker/Dockerfile
 create mode 100644 release/stable/debian10/getLatestTag.ps1
 create mode 100644 release/stable/debian10/meta.json
 create mode 100644 release/stable/debian10/test-deps/docker/Dockerfile
 create mode 100644 release/stable/debian10/test-deps/meta.json
 create mode 100644 release/stable/debian11/dependabot/Dockerfile
 rename release/stable/{opensuse423 => debian11}/docker/Dockerfile (69%)
 create mode 100644 release/stable/debian11/getLatestTag.ps1
 create mode 100644 release/stable/debian11/meta.json
 create mode 100644 release/stable/debian11/test-deps/docker/Dockerfile
 create mode 100644 release/stable/debian11/test-deps/meta.json
 create mode 100644 release/stable/fedora/dependabot/Dockerfile
 create mode 100644 release/stable/fedora/docker/Dockerfile
 rename release/{servicing/fedora28 => stable/fedora}/getLatestTag.ps1 (91%)
 create mode 100644 release/stable/fedora/meta.json
 create mode 100644 release/stable/fedora/test-deps/docker/Dockerfile
 create mode 100644 release/stable/fedora/test-deps/meta.json
 delete mode 100644 release/stable/opensuse423/meta.json

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index 08644e6f5..bb35f370d 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -5,40 +5,44 @@ version: 1
 update_configs:
   - package_manager: "docker"
     directory: "/release/preview/alpine39/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
+
+  - package_manager: "docker"
+    directory: "/release/preview/alpine311/dependabot"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/centos8/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/debian10/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/debian11/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/fedora/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/nanoserver1809/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/opensuse423/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/ubuntu18.04/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/windowsservercore/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
 
   - package_manager: "docker"
     directory: "/release/preview/alpine38/dependabot"
-    update_schedule: "daily"
+    update_schedule: "weekly"
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index b5c8db38c..9c0b1a2cb 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -80,7 +80,7 @@ stages:
         displayName: 'Install Pester'
 
       - powershell: |
-            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion)
+            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview, lts -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion)
             $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
             Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
                     Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
diff --git a/release/preview/alpine311/dependabot/Dockerfile b/release/preview/alpine311/dependabot/Dockerfile
new file mode 100644
index 000000000..79af9cda6
--- /dev/null
+++ b/release/preview/alpine311/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM alpine:3.11.3
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
new file mode 100644
index 000000000..a798f424d
--- /dev/null
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -0,0 +1,112 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
+
+# Define arg(s) needed for the From statement
+ARG fromTag=3.11
+ARG imageRepo=alpine
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG fromTag=3.11
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG PS_VERSION=7.0.0-preview.1
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.11
+ARG VCS_REF="none"
+
+# Add label last as it's just metadata and uses a lot of parameters
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    description="This Dockerfile will install the latest release of PowerShell." \
+    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+    org.label-schema.name="powershell" \
+    org.label-schema.vendor="PowerShell" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.version=${PS_VERSION} \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine311/getLatestTag.ps1 b/release/preview/alpine311/getLatestTag.ps1
new file mode 100644
index 000000000..2f01b125a
--- /dev/null
+++ b/release/preview/alpine311/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the Alpine image on
+
+# The versions of Alpine we care about, for this dockerfile
+$shortTags = @('3.11')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
new file mode 100644
index 000000000..85f6c8894
--- /dev/null
+++ b/release/preview/alpine311/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine",
+    "tagTemplates": [
+        "#psversion#-alpine-#tag#",
+        "preview-alpine-#shorttag#"
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 165
+    }
+}
diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c691ccfc9
--- /dev/null
+++ b/release/preview/alpine311/test-deps/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
+
+FROM node:10.18.1-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ARG fromTag=3.11
+
+ENV NODE_VERSION=10.18.1 \
+    YARN_VERSION=1.21.1 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.11
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
+      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
new file mode 100644
index 000000000..65f57f9fd
--- /dev/null
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine ${fromTag}",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 212
+    },
+    "TagMapping": {
+        "^.*-alpine-3.11$" : "preview-alpine-3.11"
+    }
+}
diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile
index 475dbfdea..dfa8be0b3 100644
--- a/release/preview/alpine38/test-deps/docker/Dockerfile
+++ b/release/preview/alpine38/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
 
-FROM node:10.15.3-alpine as node
+FROM node:10.18.1-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=10.18.1 \
+    YARN_VERSION=1.21.1 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
 
diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile
index 94637a9f1..bdbc6185a 100644
--- a/release/preview/alpine39/test-deps/docker/Dockerfile
+++ b/release/preview/alpine39/test-deps/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
 
-FROM node:10.15.3-alpine as node
+FROM node:10.18.1-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
@@ -10,8 +10,8 @@ FROM ${BaseImage}
 
 ARG fromTag=3.9
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=10.18.1 \
+    YARN_VERSION=1.21.1 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
 
diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile
index 0abc4fc86..ca96239e7 100644
--- a/release/preview/debian9/test-deps/docker/Dockerfile
+++ b/release/preview/debian9/test-deps/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Docker image file that describes an Debian 9image with PowerShell and test dependencies
+# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
 ARG BaseImage=mcr.microsoft.com/powershell:debian-9
 
 FROM ${BaseImage}
diff --git a/release/servicing/alpine/docker/Dockerfile b/release/servicing/alpine/docker/Dockerfile
index c8e00b4d2..ab20302d2 100644
--- a/release/servicing/alpine/docker/Dockerfile
+++ b/release/servicing/alpine/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG imageRepo=alpine
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -25,7 +25,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 RUN mkdir -p ${PS_INSTALL_FOLDER}
 
 # Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM ${imageRepo}:${fromTag}
@@ -82,7 +82,7 @@ RUN apk add --no-cache \
           }"
 
 # Define args needed only for the labels
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
 ARG VCS_REF="none"
 
diff --git a/release/servicing/alpine/meta.json b/release/servicing/alpine/meta.json
index 767ba5259..927fd7583 100644
--- a/release/servicing/alpine/meta.json
+++ b/release/servicing/alpine/meta.json
@@ -6,5 +6,9 @@
     "tagTemplates": [
         "#psversion#-alpine-#tag#"
     ],
-    "SkipGssNtlmSspTests": true
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 165
+    }
 }
diff --git a/release/servicing/arm32v7/docker/Dockerfile b/release/servicing/arm32v7/docker/Dockerfile
index 23538f0c1..d4f77c519 100644
--- a/release/servicing/arm32v7/docker/Dockerfile
+++ b/release/servicing/arm32v7/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM arm32v7/ubuntu:bionic
 
-ENV PS_VERSION=6.1.2
+ENV PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
 ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index 94f330acf..7b8d4cc6e 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -4,8 +4,8 @@ ARG imageRepo=centos
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.1
-ARG PACKAGE_VERSION=6.1.1
+ARG PS_VERSION=6.2.0
+ARG PACKAGE_VERSION=6.2.0
 ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
@@ -24,9 +24,10 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # Update now that we have epel-release
     && yum update -y \
     # Install libraries for NTLM support
-    && yum install -y gssntlmssp \
-	# less is required for help in powershell
-	less \
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
diff --git a/release/servicing/centos7/meta.json b/release/servicing/centos7/meta.json
index e12d6375a..d3a835965 100644
--- a/release/servicing/centos7/meta.json
+++ b/release/servicing/centos7/meta.json
@@ -5,5 +5,9 @@
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#tag#"
-    ]
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
 }
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index 26e9f11dd..59b90423c 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -1,11 +1,10 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch
+ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/servicing/debian9/getLatestTag.ps1 b/release/servicing/debian9/getLatestTag.ps1
index 7e230890d..4ceee128f 100644
--- a/release/servicing/debian9/getLatestTag.ps1
+++ b/release/servicing/debian9/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the debian image on Docker
 
 # The versions of debian we care about
-$shortTags = @('stretch')
+$shortTags = @('stretch-slim')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?' -AlternativeShortTag '9'
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/servicing/debian9/meta.json b/release/servicing/debian9/meta.json
index 62f43a1c5..e761f39a9 100644
--- a/release/servicing/debian9/meta.json
+++ b/release/servicing/debian9/meta.json
@@ -6,5 +6,9 @@
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-debian-#tag#"
-    ]
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
 }
diff --git a/release/servicing/fedora28/meta.json b/release/servicing/fedora28/meta.json
deleted file mode 100644
index a0675b5f2..000000000
--- a/release/servicing/fedora28/meta.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora 28",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-fedora-#tag#"
-    ]
-}
diff --git a/release/servicing/nanoserver/docker/Dockerfile b/release/servicing/nanoserver/docker/Dockerfile
index 03052208e..50a7b3bf2 100755
--- a/release/servicing/nanoserver/docker/Dockerfile
+++ b/release/servicing/nanoserver/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
 FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
 
 # Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -40,7 +40,7 @@ RUN Write-host "Verifying valid Version..."; `
 FROM ${NanoServerRepo}:${fromTag}
 
 ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
diff --git a/release/servicing/nanoserver/meta.json b/release/servicing/nanoserver/meta.json
index 731597512..533803b1c 100644
--- a/release/servicing/nanoserver/meta.json
+++ b/release/servicing/nanoserver/meta.json
@@ -3,11 +3,14 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1709"},
         {"Tag": "1803"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#"
     ],
-    "Base64EncodePackageUrl": true
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "TestProperties": {
+        "size": 1
+    }
 }
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index 5721e50cc..d5fd31ed8 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -7,10 +7,10 @@ ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:$WindowsServerCoreVersion  AS installer-env
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
 
 # Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -40,7 +40,7 @@ RUN Write-host "Verifying valid Version..."; `
 FROM ${NanoServerRepo}:${fromTag}
 
 ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
@@ -69,8 +69,19 @@ ENV ProgramFiles="C:\Program Files" `
     # Set the default windows path so we can use it
     WindowsPATH="C:\Windows\system32;C:\Windows"
 
-    # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
diff --git a/release/servicing/nanoserver1809/getLatestTag.ps1 b/release/servicing/nanoserver1809/getLatestTag.ps1
index b092d66b1..2c7ce394f 100644
--- a/release/servicing/nanoserver1809/getLatestTag.ps1
+++ b/release/servicing/nanoserver1809/getLatestTag.ps1
@@ -17,4 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
+
diff --git a/release/servicing/nanoserver1809/meta.json b/release/servicing/nanoserver1809/meta.json
index e9416772b..b5684d595 100644
--- a/release/servicing/nanoserver1809/meta.json
+++ b/release/servicing/nanoserver1809/meta.json
@@ -3,10 +3,15 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"}
+        {"Tag": "1809"},
+        {"Tag": "1903"},
+        {"Tag": "1909"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#"
     ],
-    "Base64EncodePackageUrl": true
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    }
 }
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index 1166fddb8..b51289511 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG imageRepo=opensuse/leap
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=6
@@ -31,7 +31,7 @@ RUN zypper --non-interactive install \
 ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
 
 # Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # ------ Second stage ------
 # Start a new stage so we lose all the tar.gz layers from the final image
@@ -82,7 +82,7 @@ RUN zypper --non-interactive update --skip-interactive \
           }"
 
 # Define args needed only for the labels
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell:opensuse-42.3
 ARG VCS_REF="none"
 
diff --git a/release/servicing/opensuse423/meta.json b/release/servicing/opensuse423/meta.json
index d4231e0cd..9c0b2783d 100644
--- a/release/servicing/opensuse423/meta.json
+++ b/release/servicing/opensuse423/meta.json
@@ -7,6 +7,7 @@
     "tagTemplates": [
         "#psversion#-opensuse-#tag#"
     ],
+    "SubImage": "test-deps",
     "TestProperties": {
         "size": 524
     }
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index ac1e14154..edd1aba94 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=ubuntu
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/servicing/ubuntu16.04/meta.json b/release/servicing/ubuntu16.04/meta.json
index d50482a95..2f91ae543 100644
--- a/release/servicing/ubuntu16.04/meta.json
+++ b/release/servicing/ubuntu16.04/meta.json
@@ -6,5 +6,9 @@
     "tagTemplates": [
         "#psversion#-ubuntu-#tag#"
     ],
-    "SkipGssNtlmSspTests": false
+    "SkipGssNtlmSspTests": false,
+    "TestProperties": {
+        "size": 395
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index e2f06f337..be0b79883 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=ubuntu
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
diff --git a/release/servicing/ubuntu18.04/meta.json b/release/servicing/ubuntu18.04/meta.json
index 707d9c19c..a4367ebe2 100644
--- a/release/servicing/ubuntu18.04/meta.json
+++ b/release/servicing/ubuntu18.04/meta.json
@@ -6,5 +6,9 @@
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-ubuntu-#tag#"
-    ]
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
 }
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index 7b1e26dfe..6909666ae 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -6,7 +6,7 @@ ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 # As this is a multi-stage build, this stage will eventually be thrown away
 FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
 
 SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
@@ -65,7 +65,7 @@ CMD ["pwsh.exe"]
 
 ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
 ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=6.2.0
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
index a2d2c8d16..149532755 100644
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ b/release/servicing/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1709','1803','1809')
+$shortTags = @('1803','1809','1903','1909')
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}_KB\d{7}' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/servicing/windowsservercore/meta.json b/release/servicing/windowsservercore/meta.json
index 1554d1123..9e81c4ab2 100644
--- a/release/servicing/windowsservercore/meta.json
+++ b/release/servicing/windowsservercore/meta.json
@@ -5,5 +5,8 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#tag#"
-    ]
+    ],
+    "TestProperties": {
+        "size": 1
+    }
 }
diff --git a/release/stable/alpine38/dependabot/Dockerfile b/release/stable/alpine38/dependabot/Dockerfile
new file mode 100644
index 000000000..1c8c3ded3
--- /dev/null
+++ b/release/stable/alpine38/dependabot/Dockerfile
@@ -0,0 +1 @@
+FROM node:10.15.3-alpine
diff --git a/release/stable/alpine/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
similarity index 95%
rename from release/stable/alpine/docker/Dockerfile
rename to release/stable/alpine38/docker/Dockerfile
index ab20302d2..cd337f720 100644
--- a/release/stable/alpine/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -10,10 +10,10 @@ ARG imageRepo=alpine
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Download the Linux tar.gz and save it
 ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
@@ -34,7 +34,7 @@ FROM ${imageRepo}:${fromTag}
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
 # Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
     # Define ENVs for Localization/Globalization
@@ -42,7 +42,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.8
 
 # Install dotnet dependencies and ca-certificates
 RUN apk add --no-cache \
@@ -67,6 +68,7 @@ RUN apk add --no-cache \
     \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
@@ -82,7 +84,7 @@ RUN apk add --no-cache \
           }"
 
 # Define args needed only for the labels
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
 ARG VCS_REF="none"
 
diff --git a/release/stable/alpine/getLatestTag.ps1 b/release/stable/alpine38/getLatestTag.ps1
similarity index 72%
rename from release/stable/alpine/getLatestTag.ps1
rename to release/stable/alpine38/getLatestTag.ps1
index 16be03136..bc836c038 100644
--- a/release/stable/alpine/getLatestTag.ps1
+++ b/release/stable/alpine38/getLatestTag.ps1
@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-# return objects representing the tags we need to base the xenial image on
+# return objects representing the tags we need to base the Alpine image on
 
-# The versions of xenial we care about
+# The versions of Alpine we care about, for this dockerfile
 $shortTags = @('3.8')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
@@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.8$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d$' -OnlyShortTags
diff --git a/release/stable/alpine/meta.json b/release/stable/alpine38/meta.json
similarity index 100%
rename from release/stable/alpine/meta.json
rename to release/stable/alpine38/meta.json
diff --git a/release/stable/alpine/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile
similarity index 93%
rename from release/stable/alpine/test-deps/docker/Dockerfile
rename to release/stable/alpine38/test-deps/docker/Dockerfile
index 8443b6d24..475dbfdea 100644
--- a/release/stable/alpine/test-deps/docker/Dockerfile
+++ b/release/stable/alpine38/test-deps/docker/Dockerfile
@@ -8,9 +8,10 @@ FROM node:10.15.3-alpine as node
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION 10.15.3
-ENV YARN_VERSION=1.13.0
-ENV NVM_DIR="/root/.nvm"
+ENV NODE_VERSION=10.15.3 \
+    YARN_VERSION=1.13.0 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
 
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
@@ -33,7 +34,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/stable/alpine/test-deps/meta.json b/release/stable/alpine38/test-deps/meta.json
similarity index 100%
rename from release/stable/alpine/test-deps/meta.json
rename to release/stable/alpine38/test-deps/meta.json
diff --git a/release/stable/alpine39/dependabot/Dockerfile b/release/stable/alpine39/dependabot/Dockerfile
new file mode 100644
index 000000000..cf026e7c3
--- /dev/null
+++ b/release/stable/alpine39/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM alpine:3.10.0
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
new file mode 100644
index 000000000..a06d1b12a
--- /dev/null
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -0,0 +1,110 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
+
+# Define arg(s) needed for the From statement
+ARG fromTag=3.9
+ARG imageRepo=alpine
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG fromTag=3.9
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG PS_VERSION=6.2.0
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
+ARG VCS_REF="none"
+
+# Add label last as it's just metadata and uses a lot of parameters
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    description="This Dockerfile will install the latest release of PowerShell." \
+    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+    org.label-schema.name="powershell" \
+    org.label-schema.vendor="PowerShell" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    org.label-schema.version=${PS_VERSION} \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/getLatestTag.ps1 b/release/stable/alpine39/getLatestTag.ps1
new file mode 100644
index 000000000..bab6f5f80
--- /dev/null
+++ b/release/stable/alpine39/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the Alpine image on
+
+# The versions of Alpine we care about, for this dockerfile
+$shortTags = @('3.9','3.10')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/stable/alpine39/meta.json b/release/stable/alpine39/meta.json
new file mode 100644
index 000000000..25f38575d
--- /dev/null
+++ b/release/stable/alpine39/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine",
+    "tagTemplates": [
+        "#psversion#-alpine-#tag#",
+        "alpine-#shorttag#"
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 165
+    }
+}
diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..94637a9f1
--- /dev/null
+++ b/release/stable/alpine39/test-deps/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
+
+FROM node:10.15.3-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ARG fromTag=3.9
+
+ENV NODE_VERSION=10.15.3 \
+    YARN_VERSION=1.13.0 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
+      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/test-deps/meta.json b/release/stable/alpine39/test-deps/meta.json
new file mode 100644
index 000000000..7af6a0869
--- /dev/null
+++ b/release/stable/alpine39/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine ${fromTag}",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 212
+    },
+    "TagMapping": {
+        "^.*-alpine-3.9$" : "alpine-3.9",
+        "^.*-alpine-3.10$" : "alpine-3.10"
+    }
+}
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index d4f77c519..7b95789ed 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -1,21 +1,93 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-FROM arm32v7/ubuntu:bionic
+ARG fromTag=bionic
+ARG imageRepo=arm32v7/ubuntu
 
-ENV PS_VERSION=6.2.3
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
 ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM ${imageRepo}:${fromTag} AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ARG PS_VERSION=6.2.3
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
 
 RUN \
   apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 wget --yes \
-  && wget https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} \
-  && mkdir ~/powershell \
-  && tar -xvf ./${PS_PACKAGE} -C ~/powershell \
-  && rm -rf ./${PS_PACKAGE} \
-  && ln -s /root/powershell/pwsh /usr/bin/pwsh \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-ENTRYPOINT ["pwsh"]
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/arm32v7/getLatestTag.ps1 b/release/stable/arm32v7/getLatestTag.ps1
new file mode 100644
index 000000000..f4574e134
--- /dev/null
+++ b/release/stable/arm32v7/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the CentOS image on Docker
+
+# The versions of CentOS we care about
+$shortTags = @('bionic')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/stable/arm32v7/meta.json b/release/stable/arm32v7/meta.json
new file mode 100644
index 000000000..e5c671f5e
--- /dev/null
+++ b/release/stable/arm32v7/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 18.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "#psversion#-arm32v7-ubuntu-#tag#",
+        "arm32v7-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    }
+}
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index 7b178f772..ac5d65a9a 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#tag#",
diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile
index a20039945..e170a9230 100644
--- a/release/stable/centos7/test-deps/docker/Dockerfile
+++ b/release/stable/centos7/test-deps/docker/Dockerfile
@@ -11,10 +11,11 @@ RUN yum install -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/stable/centos8/dependabot/Dockerfile b/release/stable/centos8/dependabot/Dockerfile
new file mode 100644
index 000000000..5bd787a7a
--- /dev/null
+++ b/release/stable/centos8/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM centos:8
diff --git a/release/servicing/fedora28/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
similarity index 70%
rename from release/servicing/fedora28/docker/Dockerfile
rename to release/stable/centos8/docker/Dockerfile
index cc2067c3c..10f6437d3 100644
--- a/release/servicing/fedora28/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -1,36 +1,44 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=8
+ARG imageRepo=centos
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
-ARG PS_VERSION=6.1.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
+ARG fromTag=7
+ARG imageRepo=centos
+
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    && dnf install -y \
-	# less is needed for help
-	less \
-    # Needed to run localdef
-        glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-        compat-openssl10 \
-	gssntlmssp \
-    && dnf upgrade-minimal -y --security \
-    && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
     # remove powershell package
     && rm /tmp/powershell.rpm \
+    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
@@ -45,7 +53,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
 
 # Define args needed only for the labels
 ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/stable/opensuse423/getLatestTag.ps1 b/release/stable/centos8/getLatestTag.ps1
similarity index 57%
rename from release/stable/opensuse423/getLatestTag.ps1
rename to release/stable/centos8/getLatestTag.ps1
index 9d3cfb58f..9f6c243eb 100644
--- a/release/stable/opensuse423/getLatestTag.ps1
+++ b/release/stable/centos8/getLatestTag.ps1
@@ -1,14 +1,14 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-# return objects representing the tags we need to base the opensuse image on Docker
+# return objects representing the tags we need to base the CentOS image on Docker
 
-# The versions of opensuse we care about
-$shortTags = @('42.3')
+# The versions of CentOS we care about
+$shortTags = @('8')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
new file mode 100644
index 000000000..e55b3932d
--- /dev/null
+++ b/release/stable/centos8/meta.json
@@ -0,0 +1,14 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "#psversion#-centos-#tag#",
+        "centos-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
+}
diff --git a/release/stable/opensuse423/test-deps/docker/Dockerfile b/release/stable/centos8/test-deps/docker/Dockerfile
similarity index 70%
rename from release/stable/opensuse423/test-deps/docker/Dockerfile
rename to release/stable/centos8/test-deps/docker/Dockerfile
index 66b31a398..5b9e2fc53 100644
--- a/release/stable/opensuse423/test-deps/docker/Dockerfile
+++ b/release/stable/centos8/test-deps/docker/Dockerfile
@@ -1,25 +1,22 @@
-# Docker image file that describes an OpenSuse 42.3image with PowerShell installed and Test Dependecies
-ARG BaseImage=mcr.microsoft.com/powershell:opensuse-42.3
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
 
 FROM ${BaseImage}
 
 # Install dependencies and clean up
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-         sudo \
-         tar \
-         curl \
-         wget \
-         hostname \
-    # clean package manager cache
-    && zypper clean -a \
-    # remove package manager log file
-    && rm -f /var/log/zypp/history /var/log/zypper.log
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
 # Define args needed only for the labels
 ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos7
-ARG PS_VERSION=6.2.0
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
+ARG PS_VERSION=6.2.3
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/stable/opensuse423/test-deps/meta.json b/release/stable/centos8/test-deps/meta.json
similarity index 62%
rename from release/stable/opensuse423/test-deps/meta.json
rename to release/stable/centos8/test-deps/meta.json
index 17992812e..81be65679 100644
--- a/release/stable/opensuse423/test-deps/meta.json
+++ b/release/stable/centos8/test-deps/meta.json
@@ -1,16 +1,15 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "OpenSuse 42.3",
-    "SkipGssNtlmSspTests": true,
+    "osVersion": "CentOS 8",
     "tagTemplates": [
-        "opensuse-#shorttag#"
+        "centos-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
         "test-deps"
     ],
     "TestProperties": {
-        "size": 536
+        "size": 575
     }
 }
diff --git a/release/stable/debian10/dependabot/Dockerfile b/release/stable/debian10/dependabot/Dockerfile
new file mode 100644
index 000000000..934a2d9c0
--- /dev/null
+++ b/release/stable/debian10/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM debian:10
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
new file mode 100644
index 000000000..89c4b23a2
--- /dev/null
+++ b/release/stable/debian10/docker/Dockerfile
@@ -0,0 +1,110 @@
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=buster-slim
+ARG imageRepo=debian
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.3
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:${fromTag}
+
+ARG PS_VERSION=7.0.0
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/debian10/getLatestTag.ps1 b/release/stable/debian10/getLatestTag.ps1
new file mode 100644
index 000000000..f262fed60
--- /dev/null
+++ b/release/stable/debian10/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('buster-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'buster-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '10' -SkipShortTagFilter
diff --git a/release/stable/debian10/meta.json b/release/stable/debian10/meta.json
new file mode 100644
index 000000000..321f76346
--- /dev/null
+++ b/release/stable/debian10/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 10",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#tag#",
+        "debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/stable/debian10/test-deps/docker/Dockerfile b/release/stable/debian10/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..35918f757
--- /dev/null
+++ b/release/stable/debian10/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-10
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/debian10/test-deps/meta.json b/release/stable/debian10/test-deps/meta.json
new file mode 100644
index 000000000..36de679e8
--- /dev/null
+++ b/release/stable/debian10/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 10",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/stable/debian11/dependabot/Dockerfile b/release/stable/debian11/dependabot/Dockerfile
new file mode 100644
index 000000000..8a60bc3b0
--- /dev/null
+++ b/release/stable/debian11/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM debian:11
diff --git a/release/stable/opensuse423/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
similarity index 69%
rename from release/stable/opensuse423/docker/Dockerfile
rename to release/stable/debian11/docker/Dockerfile
index b51289511..119c0b37b 100644
--- a/release/stable/opensuse423/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -1,19 +1,17 @@
-# Docker image file that describes an OpenSuse 42.3 image with PowerShell installed from tar.gz
-# Implemented in two stages, one that downloads and uncompresses the tar.gz
-# The next stage simply copies the files from the first stage,
-# effectively removing the tar.gz and packages that are not needed from the final image.
-
-# Define arg(s) needed for the From statement
-ARG fromTag=42.3
-ARG imageRepo=opensuse/leap
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG fromTag=bullseye-slim
+ARG imageRepo=debian
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
 
 # define the folder we will be installing PowerShell to
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
@@ -21,27 +19,20 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
 
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive
-
-RUN zypper --non-interactive install \
-        tar
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
 # Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
-# ------ Second stage ------
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM ${imageRepo}:${fromTag}
 
+ARG PS_VERSION=6.2.0
+ARG PS_INSTALL_VERSION=7
+
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
 # Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
     # Define ENVs for Localization/Globalization
@@ -49,26 +40,39 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
 
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-        glibc-locale \
-        glibc-i18ndata \
-        libicu \
-        openssl \
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+    # less is required for help in powershell
         less \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # clean package manager cache
-    && zypper clean -a \
-    # remove package manager log file
-    && rm -f /var/log/zypp/history /var/log/zypper.log \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
@@ -82,11 +86,9 @@ RUN zypper --non-interactive update --skip-interactive \
           }"
 
 # Define args needed only for the labels
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:opensuse-42.3
 ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
 
-# Add label last as it's just metadata and uses a lot of parameters
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
       description="This Dockerfile will install the latest release of PowerShell." \
@@ -95,12 +97,14 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
       org.label-schema.name="powershell" \
       org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
       org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
       org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
       org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
 
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian11/getLatestTag.ps1 b/release/stable/debian11/getLatestTag.ps1
new file mode 100644
index 000000000..f19797bb9
--- /dev/null
+++ b/release/stable/debian11/getLatestTag.ps1
@@ -0,0 +1,14 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# return objects representing the tags we need to base the debian image on Docker
+
+# The versions of debian we care about
+$shortTags = @('bullseye-slim')
+
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath
+
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
new file mode 100644
index 000000000..01d4573f6
--- /dev/null
+++ b/release/stable/debian11/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 11 (Testing)",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#tag#",
+        "debian-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/stable/debian11/test-deps/docker/Dockerfile b/release/stable/debian11/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..af918cf6e
--- /dev/null
+++ b/release/stable/debian11/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-11
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/debian11/test-deps/meta.json b/release/stable/debian11/test-deps/meta.json
new file mode 100644
index 000000000..24f5a7c54
--- /dev/null
+++ b/release/stable/debian11/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 11 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/stable/debian9/meta.json b/release/stable/debian9/meta.json
index 6ebf517d5..e8e66cada 100644
--- a/release/stable/debian9/meta.json
+++ b/release/stable/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.debian.9_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile
index 50db06b5a..9ec961ba7 100644
--- a/release/stable/debian9/test-deps/docker/Dockerfile
+++ b/release/stable/debian9/test-deps/docker/Dockerfile
@@ -15,10 +15,12 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
+
 # Define args needed only for the labels
 ARG VCS_REF="none"
 ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
diff --git a/release/stable/fedora/dependabot/Dockerfile b/release/stable/fedora/dependabot/Dockerfile
new file mode 100644
index 000000000..2b4d6bd3e
--- /dev/null
+++ b/release/stable/fedora/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM fedora:30
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
new file mode 100644
index 000000000..206952e86
--- /dev/null
+++ b/release/stable/fedora/docker/Dockerfile
@@ -0,0 +1,111 @@
+# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
+ARG fromTag=28
+ARG imageRepo=fedora
+
+FROM ${imageRepo}:${fromTag} AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+ARG fromTag=28
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && dnf install -y /tmp/powershell.rpm \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && echo "starting misc packages" \
+    && dnf install -y \
+    # less is needed for help
+      less \
+    # Needed to run localdef
+      glibc-locale-source \
+    # Invoke-WebRequest doesn't work correctly without this
+      compat-openssl10 \
+      ca-certificates \
+      gssntlmssp \
+    && echo "end - misc packages" \
+    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
+    && echo "starting FEDORA-2019-27e7b92407" \
+    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
+    # to do this, upgrade libmodulemd1, if it is installed
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          try { \$packageList = dnf list installed libmodulemd1} \
+          catch {}; \
+          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
+          if(\$module) { \
+            Write-Host '******* Patching *********'; \
+            dnf upgrade -y libmodulemd1 \
+          }" \
+    && echo "end - FEDORA-2019-27e7b92407" \
+    # This installs most security advisories
+    && echo "starting upgrade minimal" \
+    && dnf upgrade-minimal -y --security \
+    && echo "end - upgrade minimal" \
+    # query and install any remaining security advisories
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          Write-Host '******* Getting security advisory list *********'; \
+          (dnf updateinfo list -q --security) |  \
+              Foreach-Object { \
+                  \$advisory=(\$_ -split ' ')[0]; \
+                  Write-Host '******* Patching *********'; \
+                  Write-Host \$advisory; \
+                  Write-Host '************************'; \
+                  dnf upgrade -y --advisory=\$advisory \
+              }" \
+    && echo "verifying all security advisories are installed..." \
+    && dnf updateinfo list -q --security \
+    && echo "end - verifying all security advisories are installed..." \
+    && dnf clean all \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/servicing/fedora28/getLatestTag.ps1 b/release/stable/fedora/getLatestTag.ps1
similarity index 91%
rename from release/servicing/fedora28/getLatestTag.ps1
rename to release/stable/fedora/getLatestTag.ps1
index 5e8290dce..c9ad27d2d 100644
--- a/release/servicing/fedora28/getLatestTag.ps1
+++ b/release/stable/fedora/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the fedora image on
 
 # The versions of fedora we care about
-$shortTags = @('28')
+$shortTags = @('30')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^28$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/stable/fedora/meta.json b/release/stable/fedora/meta.json
new file mode 100644
index 000000000..19da911bd
--- /dev/null
+++ b/release/stable/fedora/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "Fedora",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-fedora-#tag#",
+        "fedora-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/stable/fedora/test-deps/docker/Dockerfile b/release/stable/fedora/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..e0004d29a
--- /dev/null
+++ b/release/stable/fedora/test-deps/docker/Dockerfile
@@ -0,0 +1,43 @@
+# Docker image file that describes an Fedora 28 image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
+
+FROM ${BaseImage}
+
+ARG fromTag=28
+
+# Install dependencies and clean up
+RUN dnf install -y \
+        sudo \
+        findutils \
+        hostname \
+        iputils \
+        wget \
+        procps-ng \
+    && dnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/fedora/test-deps/meta.json b/release/stable/fedora/test-deps/meta.json
new file mode 100644
index 000000000..8a82bf53d
--- /dev/null
+++ b/release/stable/fedora/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Fedora ${fromTag}",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 632
+    },
+    "TagMapping": {
+        "^.*-fedora-30$" : "fedora-30"
+    }
+}
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index d5fd31ed8..51c74f421 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -10,7 +10,7 @@ ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
 FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
 
 # Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
@@ -39,26 +39,12 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:${fromTag}
 
+ARG fromTag=1709
+
 ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
+ARG PS_VERSION=7.0.0
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
@@ -67,7 +53,8 @@ ENV ProgramFiles="C:\Program Files" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows"
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
 
 ### Begin workaround ###
 # Note that changing user on nanoserver is not recommended
@@ -99,4 +86,20 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      description="This Dockerfile will install the latest release of PowerShell." `
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
+      org.label-schema.name="powershell" `
+      org.label-schema.vcs-ref=${VCS_REF} `
+      org.label-schema.vendor="PowerShell" `
+      org.label-schema.version=${PS_VERSION} `
+      org.label-schema.schema-version="1.0" `
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
 CMD ["pwsh.exe"]
diff --git a/release/stable/opensuse423/meta.json b/release/stable/opensuse423/meta.json
deleted file mode 100644
index 19c02899d..000000000
--- a/release/stable/opensuse423/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "OpenSuse 42.3",
-    "SkipGssNtlmSspTests": true,
-    "tagTemplates": [
-        "#psversion#-opensuse-#tag#",
-        "opensuse-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 524
-    }
-}
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index edd1aba94..591b0ad83 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -13,7 +13,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
 
 # Install dependencies and clean up
 RUN apt-get update \
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index 0f210994a..80078d4fa 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-#tag#",
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index be0b79883..894f49023 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -13,7 +13,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
 
 # Install dependencies and clean up
 RUN apt-get update \
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index 6824b3ab2..a830870dc 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile
index 6909666ae..59ae550b5 100755
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore/docker/Dockerfile
@@ -39,7 +39,8 @@ ENV ProgramFiles="C:\Program Files" `
     LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe"
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}"
 
 # Copy PowerShell Core from the installer container
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 4137389dd..dbc0af666 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -416,7 +416,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                     switch -RegEx ($_.Channel)
                     {
                         'stable' {
-                            $path = '/opt/microsoft/powershell/6/pwsh'
+                            $path = '/opt/microsoft/powershell/7/pwsh'
                         }
                         'lts' {
                             $path = '/opt/microsoft/powershell/7-lts/pwsh'
diff --git a/vsts-ci.yml b/vsts-ci.yml
index af4406072..36e4c705a 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -28,7 +28,7 @@ stages:
     jobs:
     - job: CheckForDuplicateTags
       pool:
-        vmImage: ubuntu-16.04
+        vmImage: ubuntu-18.04
       displayName: Check For Duplicate Tags
       steps:
       - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"

From 112cfaf357bee4d5610617a9afe5b33f3b591207 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 12 Mar 2020 16:00:19 -0400
Subject: [PATCH 047/354] Move broken images (#386)

* Move broken images

Signed-off-by: Reece Dunham <me@rdil.rocks>

* fix version

* make kali-rolling unstable

Co-authored-by: Travis Plunk <github@ez13.net>
---
 .gitpod.yml                                                 | 2 +-
 release/community-stable/amazonlinux/docker/Dockerfile      | 2 +-
 release/community-stable/archlinux/docker/Dockerfile        | 4 ++--
 release/community-stable/blackarch/docker/Dockerfile        | 2 +-
 release/community-stable/oraclelinux/docker/Dockerfile      | 2 +-
 release/community-stable/photon/docker/Dockerfile           | 4 ++--
 release/unstable/README.md                                  | 6 ++++++
 .../clearlinux/docker/Dockerfile                            | 0
 .../clearlinux/getLatestTag.ps1                             | 0
 release/{community-stable => unstable}/clearlinux/meta.json | 0
 .../kali-rolling/docker/Dockerfile                          | 2 +-
 .../kali-rolling/getLatestTag.ps1                           | 0
 .../{community-stable => unstable}/kali-rolling/meta.json   | 0
 .../{community-stable => unstable}/parrot/docker/Dockerfile | 0
 .../{community-stable => unstable}/parrot/getLatestTag.ps1  | 0
 release/{community-stable => unstable}/parrot/meta.json     | 0
 .gitpod.Dockerfile => tools/.gitpod.Dockerfile              | 0
 17 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 release/unstable/README.md
 rename release/{community-stable => unstable}/clearlinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/clearlinux/getLatestTag.ps1 (100%)
 rename release/{community-stable => unstable}/clearlinux/meta.json (100%)
 rename release/{community-stable => unstable}/kali-rolling/docker/Dockerfile (99%)
 rename release/{community-stable => unstable}/kali-rolling/getLatestTag.ps1 (100%)
 rename release/{community-stable => unstable}/kali-rolling/meta.json (100%)
 rename release/{community-stable => unstable}/parrot/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/parrot/getLatestTag.ps1 (100%)
 rename release/{community-stable => unstable}/parrot/meta.json (100%)
 rename .gitpod.Dockerfile => tools/.gitpod.Dockerfile (100%)

diff --git a/.gitpod.yml b/.gitpod.yml
index 527c76d39..6dbc94e04 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,2 +1,2 @@
 image:
-  file: .gitpod.Dockerfile
+  file: tools/.gitpod.Dockerfile
diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 2d3320f8f..4aaff8b0f 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index fb647e3bf..17e0e3b3c 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -53,7 +53,7 @@ COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -94,7 +94,7 @@ RUN \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # Pull down the powershell linux tar file
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \ 
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \
     # uncompress powershell linux tar file
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} -v \
     # remove powershell linux tar file
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 63e4f1a7c..ae509d622 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -60,7 +60,7 @@ ADD ${BlackArch_Strap_URL} /tmp/strap.sh
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 2ec840a7d..2cf8b36ea 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index c18a6a716..3ca3667d7 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
@@ -43,7 +43,7 @@ COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershe
 
 # Define Args and Env needed to create links
 ARG PS_VERSION=6.1.0
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
     # Define ENVs for Localization/Globalization
diff --git a/release/unstable/README.md b/release/unstable/README.md
new file mode 100644
index 000000000..340bab232
--- /dev/null
+++ b/release/unstable/README.md
@@ -0,0 +1,6 @@
+# Unstable
+
+This folder is a home for broken images.
+They are here so that they don't get triggered in CI runs.
+
+If you want to help fix them, go ahead.
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/unstable/clearlinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/clearlinux/docker/Dockerfile
rename to release/unstable/clearlinux/docker/Dockerfile
diff --git a/release/community-stable/clearlinux/getLatestTag.ps1 b/release/unstable/clearlinux/getLatestTag.ps1
similarity index 100%
rename from release/community-stable/clearlinux/getLatestTag.ps1
rename to release/unstable/clearlinux/getLatestTag.ps1
diff --git a/release/community-stable/clearlinux/meta.json b/release/unstable/clearlinux/meta.json
similarity index 100%
rename from release/community-stable/clearlinux/meta.json
rename to release/unstable/clearlinux/meta.json
diff --git a/release/community-stable/kali-rolling/docker/Dockerfile b/release/unstable/kali-rolling/docker/Dockerfile
similarity index 99%
rename from release/community-stable/kali-rolling/docker/Dockerfile
rename to release/unstable/kali-rolling/docker/Dockerfile
index be85e2fdf..a87ec22ae 100644
--- a/release/community-stable/kali-rolling/docker/Dockerfile
+++ b/release/unstable/kali-rolling/docker/Dockerfile
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 ARG PS_VERSION=6.2.3
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Define Args for the needed to add the package
 ARG KALI_REPO_KEY_PACKAGE_URL=https://http.kali.org/kali/pool/main/k/kali-archive-keyring/kali-archive-keyring_2018.2_all.deb
diff --git a/release/community-stable/kali-rolling/getLatestTag.ps1 b/release/unstable/kali-rolling/getLatestTag.ps1
similarity index 100%
rename from release/community-stable/kali-rolling/getLatestTag.ps1
rename to release/unstable/kali-rolling/getLatestTag.ps1
diff --git a/release/community-stable/kali-rolling/meta.json b/release/unstable/kali-rolling/meta.json
similarity index 100%
rename from release/community-stable/kali-rolling/meta.json
rename to release/unstable/kali-rolling/meta.json
diff --git a/release/community-stable/parrot/docker/Dockerfile b/release/unstable/parrot/docker/Dockerfile
similarity index 100%
rename from release/community-stable/parrot/docker/Dockerfile
rename to release/unstable/parrot/docker/Dockerfile
diff --git a/release/community-stable/parrot/getLatestTag.ps1 b/release/unstable/parrot/getLatestTag.ps1
similarity index 100%
rename from release/community-stable/parrot/getLatestTag.ps1
rename to release/unstable/parrot/getLatestTag.ps1
diff --git a/release/community-stable/parrot/meta.json b/release/unstable/parrot/meta.json
similarity index 100%
rename from release/community-stable/parrot/meta.json
rename to release/unstable/parrot/meta.json
diff --git a/.gitpod.Dockerfile b/tools/.gitpod.Dockerfile
similarity index 100%
rename from .gitpod.Dockerfile
rename to tools/.gitpod.Dockerfile

From 3aa579c3327337475d4902250091ae08d9e19fad Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 12 Mar 2020 16:39:04 -0400
Subject: [PATCH 048/354] Fixed dependabot configuration (#379)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .dependabot/config.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index bb35f370d..d46a34332 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -31,10 +31,6 @@ update_configs:
     directory: "/release/preview/nanoserver1809/dependabot"
     update_schedule: "weekly"
 
-  - package_manager: "docker"
-    directory: "/release/preview/opensuse423/dependabot"
-    update_schedule: "weekly"
-
   - package_manager: "docker"
     directory: "/release/preview/ubuntu18.04/dependabot"
     update_schedule: "weekly"

From 3050b32353c55d5e9cb2aff5d108d1488f6f840e Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 12 Mar 2020 17:19:49 -0400
Subject: [PATCH 049/354] Eradicate nanoserver and wsc 1803 because they are
 EOL (#385)

Signed-off-by: Reece Dunham <me@rdil.rocks>
---
 createAllManifests.ps1                        | 17 ++--
 release/lts/nanoserver/docker/Dockerfile      | 92 -------------------
 release/lts/nanoserver/getLatestTag.ps1       | 30 ------
 release/lts/nanoserver/meta.json              | 16 ----
 .../lts/windowsservercore/getLatestTag.ps1    |  2 +-
 release/preview/nanoserver/docker/Dockerfile  | 92 -------------------
 release/preview/nanoserver/getLatestTag.ps1   | 30 ------
 release/preview/nanoserver/meta.json          | 17 ----
 .../windowsservercore/getLatestTag.ps1        |  2 +-
 .../servicing/nanoserver/docker/Dockerfile    | 89 ------------------
 release/servicing/nanoserver/getLatestTag.ps1 | 30 ------
 release/servicing/nanoserver/meta.json        | 16 ----
 .../windowsservercore/getLatestTag.ps1        |  2 +-
 release/stable/nanoserver/docker/Dockerfile   | 89 ------------------
 release/stable/nanoserver/getLatestTag.ps1    | 30 ------
 release/stable/nanoserver/meta.json           | 17 ----
 .../stable/windowsservercore/getLatestTag.ps1 |  2 +-
 17 files changed, 11 insertions(+), 562 deletions(-)
 delete mode 100755 release/lts/nanoserver/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver/getLatestTag.ps1
 delete mode 100644 release/lts/nanoserver/meta.json
 delete mode 100755 release/preview/nanoserver/docker/Dockerfile
 delete mode 100644 release/preview/nanoserver/getLatestTag.ps1
 delete mode 100644 release/preview/nanoserver/meta.json
 delete mode 100755 release/servicing/nanoserver/docker/Dockerfile
 delete mode 100644 release/servicing/nanoserver/getLatestTag.ps1
 delete mode 100644 release/servicing/nanoserver/meta.json
 delete mode 100755 release/stable/nanoserver/docker/Dockerfile
 delete mode 100644 release/stable/nanoserver/getLatestTag.ps1
 delete mode 100644 release/stable/nanoserver/meta.json

diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index bafad6852..e55d388bf 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -17,27 +17,24 @@ $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1
 
 $latestStableUbuntu   = "ubuntu-bionic"
 $latestStableWscLtsc  = "windowsservercore-latest"
-$latestStableWsc1803  = "windowsservercore-1803"
 $latestStableWsc1809  = "windowsservercore-1809"
 $latestStableWsc1903  = "windowsservercore-1903"
-$latestStableNano1803 = "nanoserver-1803"
 $latestStableNano1809 = "nanoserver-1809"
 $latestStableNano1903 = "nanoserver-1903"
 
-$latestPreviewUbuntu   = "preview-ubuntu-bionic"
-$latestPreviewWscLtsc  = "preview-windowsservercore-latest"
-$latestPreviewWsc1803  = "preview-windowsservercore-1803"
-$latestPreviewWsc1809  = "preview-windowsservercore-1809"
-$latestPreviewWsc1903  = "preview-windowsservercore-1809"
+$latestPreviewUbuntu  = "preview-ubuntu-bionic"
+$latestPreviewWscLtsc = "preview-windowsservercore-latest"
+$latestPreviewWsc1809 = "preview-windowsservercore-1809"
+$latestPreviewWsc1903 = "preview-windowsservercore-1809"
 
 switch ($Channel)
 {
     'preview' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1803, $latestPreviewWsc1809  -ManifestTag 'preview'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1809 -ManifestTag 'preview'
     }
 
     'stable' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1803, $latestStableWsc1809 -ManifestTag 'latest'
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1803, $latestStableNano1809 -ManifestTag 'nanoserver'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1809 -ManifestTag 'latest'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1809 -ManifestTag 'nanoserver'
     }
 }
diff --git a/release/lts/nanoserver/docker/Dockerfile b/release/lts/nanoserver/docker/Dockerfile
deleted file mode 100755
index 7feb50cfe..000000000
--- a/release/lts/nanoserver/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG fromTag=1709
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG fromTag=1709
-
-ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0-rc.1
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver/getLatestTag.ps1 b/release/lts/nanoserver/getLatestTag.ps1
deleted file mode 100644
index 7b8017d27..000000000
--- a/release/lts/nanoserver/getLatestTag.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-if(!$CI.IsPresent)
-{
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
-}
-else {
-    # This is not supported for nanoserver so don't build in production but try building it as a CI test for the Dockerfile
-    $shortTags = @('latest')
-
-    # The \d{4,} part of the regex is because the API is returning tags which are 3 digits and older than the 4 digit tags
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '10\.0\.14393\.\d{4,}$' -SkipShortTagFilter -Mcr
-}
diff --git a/release/lts/nanoserver/meta.json b/release/lts/nanoserver/meta.json
deleted file mode 100644
index 2eee0d0f9..000000000
--- a/release/lts/nanoserver/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
-    "shortTags": [
-        {"Tag": "1803"}
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/lts/windowsservercore/getLatestTag.ps1 b/release/lts/windowsservercore/getLatestTag.ps1
index cf9142c8c..021417e8c 100644
--- a/release/lts/windowsservercore/getLatestTag.ps1
+++ b/release/lts/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903')
+$shortTags = @('1809','1903')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/preview/nanoserver/docker/Dockerfile b/release/preview/nanoserver/docker/Dockerfile
deleted file mode 100755
index 7feb50cfe..000000000
--- a/release/preview/nanoserver/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG fromTag=1709
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG fromTag=1709
-
-ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0-rc.1
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver/getLatestTag.ps1 b/release/preview/nanoserver/getLatestTag.ps1
deleted file mode 100644
index 7b8017d27..000000000
--- a/release/preview/nanoserver/getLatestTag.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-if(!$CI.IsPresent)
-{
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
-}
-else {
-    # This is not supported for nanoserver so don't build in production but try building it as a CI test for the Dockerfile
-    $shortTags = @('latest')
-
-    # The \d{4,} part of the regex is because the API is returning tags which are 3 digits and older than the 4 digit tags
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '10\.0\.14393\.\d{4,}$' -SkipShortTagFilter -Mcr
-}
diff --git a/release/preview/nanoserver/meta.json b/release/preview/nanoserver/meta.json
deleted file mode 100644
index ec6260a17..000000000
--- a/release/preview/nanoserver/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
-    "shortTags": [
-        {"Tag": "1803"}
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#tag#",
-        "preview-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
index 149532755..b481c4ef5 100644
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ b/release/preview/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903','1909')
+$shortTags = @('1809','1903','1909')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/servicing/nanoserver/docker/Dockerfile b/release/servicing/nanoserver/docker/Dockerfile
deleted file mode 100755
index 50a7b3bf2..000000000
--- a/release/servicing/nanoserver/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG fromTag=1709
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.2.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe"
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-CMD ["pwsh.exe"]
diff --git a/release/servicing/nanoserver/getLatestTag.ps1 b/release/servicing/nanoserver/getLatestTag.ps1
deleted file mode 100644
index 7b8017d27..000000000
--- a/release/servicing/nanoserver/getLatestTag.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-if(!$CI.IsPresent)
-{
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
-}
-else {
-    # This is not supported for nanoserver so don't build in production but try building it as a CI test for the Dockerfile
-    $shortTags = @('latest')
-
-    # The \d{4,} part of the regex is because the API is returning tags which are 3 digits and older than the 4 digit tags
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '10\.0\.14393\.\d{4,}$' -SkipShortTagFilter -Mcr
-}
diff --git a/release/servicing/nanoserver/meta.json b/release/servicing/nanoserver/meta.json
deleted file mode 100644
index 533803b1c..000000000
--- a/release/servicing/nanoserver/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
-    "shortTags": [
-        {"Tag": "1803"}
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#tag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
index 149532755..b481c4ef5 100644
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ b/release/servicing/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903','1909')
+$shortTags = @('1809','1903','1909')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/nanoserver/docker/Dockerfile b/release/stable/nanoserver/docker/Dockerfile
deleted file mode 100755
index 50a7b3bf2..000000000
--- a/release/stable/nanoserver/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG fromTag=1709
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.2.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe"
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver/getLatestTag.ps1 b/release/stable/nanoserver/getLatestTag.ps1
deleted file mode 100644
index 7b8017d27..000000000
--- a/release/stable/nanoserver/getLatestTag.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-if(!$CI.IsPresent)
-{
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
-}
-else {
-    # This is not supported for nanoserver so don't build in production but try building it as a CI test for the Dockerfile
-    $shortTags = @('latest')
-
-    # The \d{4,} part of the regex is because the API is returning tags which are 3 digits and older than the 4 digit tags
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '10\.0\.14393\.\d{4,}$' -SkipShortTagFilter -Mcr
-}
diff --git a/release/stable/nanoserver/meta.json b/release/stable/nanoserver/meta.json
deleted file mode 100644
index 922d241a4..000000000
--- a/release/stable/nanoserver/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
-    "shortTags": [
-        {"Tag": "1803"}
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#tag#",
-        "nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
index 149532755..b481c4ef5 100644
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ b/release/stable/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1803','1809','1903','1909')
+$shortTags = @('1809','1903','1909')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

From 7827aeac4ed6ebad40ae5c112be65a4fc4d6e709 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 13 Mar 2020 11:47:52 -0700
Subject: [PATCH 050/354] use standard build pool (#390)

---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 9c0b1a2cb..4d8dc83d1 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -32,7 +32,7 @@ stages:
       displayName: Create Preview Manifest Lists
       condition: succeededOrFailed()
       pool:
-        name: PowerShell
+        name: Package ES Standard Build
         timeoutInMinutes: 30
 
       steps:
@@ -46,7 +46,7 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        name: PowerShell
+        name: Package ES Standard Build
         timeoutInMinutes: 30
 
       steps:

From b344cba9ed856bc9d4d39263a783af1fe4d51497 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 16 Mar 2020 09:47:53 -0700
Subject: [PATCH 051/354] Fix pool used to generate manifests during release
 builds (#392)

* use standard build pool

* use windows latest image

* run all windows builds in parallel
---
 .vsts-ci/releaseStage.yml | 2 +-
 .vsts-ci/releasebuild.yml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index ba2ec683a..09eb655cf 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -40,4 +40,4 @@ stages:
         ACR: yes
         # failure rate is High in ACR for Windows and we have few images.
         # No reason to stress the system.
-        maxParallel: 1
+        maxParallel: 3
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 4d8dc83d1..578562fed 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -32,11 +32,12 @@ stages:
       displayName: Create Preview Manifest Lists
       condition: succeededOrFailed()
       pool:
-        name: Package ES Standard Build
+        vmImage: windows-latest
         timeoutInMinutes: 30
 
       steps:
       - template: manifestSteps.yml
+
     - job: StableManifestPhase
       variables:
         releaseTag: $(stableReleaseTag)
@@ -46,11 +47,12 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        name: Package ES Standard Build
+        vmImage: windows-latest
         timeoutInMinutes: 30
 
       steps:
       - template: manifestSteps.yml
+
   - stage: GenerateTagsYaml
     dependsOn: []
     jobs:

From 0f5b76f60055a18526f2d4e3d46371af0681598d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 25 Mar 2020 11:44:15 -0700
Subject: [PATCH 052/354] Increase size allowed for alpine test-deps (#396)

---
 release/preview/alpine311/test-deps/meta.json | 2 +-
 release/preview/alpine38/test-deps/meta.json  | 2 +-
 release/preview/alpine39/test-deps/meta.json  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
index 65f57f9fd..d072f7123 100644
--- a/release/preview/alpine311/test-deps/meta.json
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 225
     },
     "TagMapping": {
         "^.*-alpine-3.11$" : "preview-alpine-3.11"
diff --git a/release/preview/alpine38/test-deps/meta.json b/release/preview/alpine38/test-deps/meta.json
index 0ef173188..54ff28c1e 100644
--- a/release/preview/alpine38/test-deps/meta.json
+++ b/release/preview/alpine38/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 225
     }
 }
diff --git a/release/preview/alpine39/test-deps/meta.json b/release/preview/alpine39/test-deps/meta.json
index 8c3a220c4..361a1325b 100644
--- a/release/preview/alpine39/test-deps/meta.json
+++ b/release/preview/alpine39/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 225
     },
     "TagMapping": {
         "^.*-alpine-3.9$" : "preview-alpine-3.9",

From a5a07178865c472bc5964200f777e1afc8a3c39d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Apr 2020 14:41:27 -0700
Subject: [PATCH 053/354] Fix issues (#408)

* make sure community release pushes

* mark unstable images as stable
---
 .vsts-ci/communityReleasePhase.yml                          | 6 +-----
 .../archlinux/docker/Dockerfile                             | 0
 .../archlinux/getLatestTag.ps1                              | 0
 release/{community-stable => unstable}/archlinux/meta.json  | 0
 .../blackarch/docker/Dockerfile                             | 0
 .../blackarch/getLatestTag.ps1                              | 0
 release/{community-stable => unstable}/blackarch/meta.json  | 0
 7 files changed, 1 insertion(+), 5 deletions(-)
 rename release/{community-stable => unstable}/archlinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/archlinux/getLatestTag.ps1 (100%)
 rename release/{community-stable => unstable}/archlinux/meta.json (100%)
 rename release/{community-stable => unstable}/blackarch/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/blackarch/getLatestTag.ps1 (100%)
 rename release/{community-stable => unstable}/blackarch/meta.json (100%)

diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
index cade16d58..8038c3a8b 100644
--- a/.vsts-ci/communityReleasePhase.yml
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -38,11 +38,7 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      $extraParams = @{}
-      Write-Host 'Not in ACR, will push...'
-      $extraParams.Add('Push',$true)
-
-      ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -Repository $(dockerNamespace)/$(dockerImage)
+      ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' -Push -Repository $(dockerNamespace)/$(dockerImage)
     displayName: 'Build'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/unstable/archlinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/archlinux/docker/Dockerfile
rename to release/unstable/archlinux/docker/Dockerfile
diff --git a/release/community-stable/archlinux/getLatestTag.ps1 b/release/unstable/archlinux/getLatestTag.ps1
similarity index 100%
rename from release/community-stable/archlinux/getLatestTag.ps1
rename to release/unstable/archlinux/getLatestTag.ps1
diff --git a/release/community-stable/archlinux/meta.json b/release/unstable/archlinux/meta.json
similarity index 100%
rename from release/community-stable/archlinux/meta.json
rename to release/unstable/archlinux/meta.json
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/unstable/blackarch/docker/Dockerfile
similarity index 100%
rename from release/community-stable/blackarch/docker/Dockerfile
rename to release/unstable/blackarch/docker/Dockerfile
diff --git a/release/community-stable/blackarch/getLatestTag.ps1 b/release/unstable/blackarch/getLatestTag.ps1
similarity index 100%
rename from release/community-stable/blackarch/getLatestTag.ps1
rename to release/unstable/blackarch/getLatestTag.ps1
diff --git a/release/community-stable/blackarch/meta.json b/release/unstable/blackarch/meta.json
similarity index 100%
rename from release/community-stable/blackarch/meta.json
rename to release/unstable/blackarch/meta.json

From 3eb147a2ad958eef111af5f715f8aa1783adb4f6 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Apr 2020 14:52:50 -0700
Subject: [PATCH 054/354] fix community image name (#409)

---
 .vsts-ci/communityReleasePhase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
index 8038c3a8b..72f3566a8 100644
--- a/.vsts-ci/communityReleasePhase.yml
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -13,7 +13,7 @@ jobs:
       matrix: $[ ${{ parameters.matrix }} ]
       maxParallel: ${{ parameters.maxParallel }}
   variables:
-    dockerImage: 'powershell'
+    dockerImage: 'powershellcommunity'
     Channel: ${{ parameters.channel }}
     ACR: ${{ parameters.ACR }}
     releaseTag: ${{ parameters.releaseTag }}

From 95a36b1d20be7d3b87c85ed89c60a3a54421e381 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Wed, 15 Apr 2020 18:08:29 -0400
Subject: [PATCH 055/354] Refactoring (#400)

Signed-off-by: Reece Dunham <me@rdil.rocks>
---
 .github/CODEOWNERS                            |  1 +
 .vsts-ci/communityReleasePhase.yml            |  2 +-
 .vsts-ci/phase.yml                            |  2 -
 .vsts-ci/releasePhase.yml                     |  2 +-
 .vsts-ci/releasebuild.yml                     |  2 +-
 README.md                                     | 51 ++-----------------
 MAINTAINERS => docs/MAINTAINERS               |  0
 {assets => docs}/README.powershell.md         |  0
 .../README.powershellcommunity.md             |  4 ++
 {assets => docs}/about_readme.powershell.md   |  2 +-
 docs/development.md                           | 42 +++++++++++++++
 11 files changed, 56 insertions(+), 52 deletions(-)
 rename MAINTAINERS => docs/MAINTAINERS (100%)
 rename {assets => docs}/README.powershell.md (100%)
 rename {assets => docs}/README.powershellcommunity.md (99%)
 rename {assets => docs}/about_readme.powershell.md (89%)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 29cc6433e..4ce53b340 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,3 +3,4 @@
 # Areas are not limited to the filters defined in this file
 
 **/* @anmenaga @TravisEz13
+docs/* @RDIL
diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
index 72f3566a8..3c8852e26 100644
--- a/.vsts-ci/communityReleasePhase.yml
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -33,7 +33,7 @@ jobs:
     displayName: 'docker login'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+  - pwsh: 'Install-module pester -Scope CurrentUser -Force'
     displayName: 'Install Pester'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index fc3004820..c8dd4141b 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -56,7 +56,6 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ variables.continueonerror }}
 
-
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }
       $files = @(Get-ChildItem -Recurse test*.xml)
@@ -67,7 +66,6 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ variables.continueonerror }}
 
-
   - task: PublishTestResults@2
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     displayName: Publish $(ImageName) Test Results **\test*.xml
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 86353c23b..bc9b6b9cb 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -80,7 +80,7 @@ jobs:
     displayName: 'Set SasUrl variable'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+  - pwsh: 'Install-module pester -Scope CurrentUser -Force'
     displayName: 'Install Pester'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 578562fed..a01a4c7f2 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -78,7 +78,7 @@ stages:
       - powershell: 'Get-ChildItem env:'
         displayName: 'Capture Environment'
 
-      - powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
+      - powershell: 'Install-module pester -Scope CurrentUser -Force'
         displayName: 'Install Pester'
 
       - powershell: |
diff --git a/README.md b/README.md
index 3607aa3af..aa021e8eb 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Docker
+# PowerShell-Docker
 
-These Dockerfiles enable running PowerShell in a container for each Linux distribution we support.
+These `Dockerfile`s enable running PowerShell in a container for each Linux distribution we support.
 
 This requires Docker 17.05 or newer.
 It also expects you to be able to run Docker without `sudo`.
-Please follow [Docker's official instructions][install] to install `docker` correctly.
+Please follow [Docker's official instructions][install] to install Docker correctly.
 
 [install]: https://docs.docker.com/engine/installation/
 
@@ -52,48 +52,6 @@ PS /> Write-Host "Hello, World!"
 Hello, World!
 ```
 
-## Building the images
-
-To build an image run `./build.ps1 -build -name <ImageFolderName>`.
-
-### Example
-
-For example to build Ubuntu 16.04/xenial, which is in `./release/ubuntu16.04`:
-
-```sh
-PS /powershell-docker> ./build.ps1 -Build -Name ubuntu16.04
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-16.04 PSversion: 6.0.2
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-trusty PSversion: 6.0.2
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-trusty-20180531 PSversion: 6.0.2
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-16.04 PSversion: 6.1.0~preview.2
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-trusty PSversion: 6.1.0~preview.2
-VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-trusty-20180531 PSversion: 6.1.0~preview.2
-VERBOSE: image name: powershell.local:6.0.2-ubuntu-16.04
-VERBOSE: image name: powershell.local:6.0.2-ubuntu-trusty
-VERBOSE: image name: powershell.local:6.0.2-ubuntu-trusty-20180531
-VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-16.04
-VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-trusty
-VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-trusty-20180531
-```
-
-### Run the Docker image you built
-
-```sh
-PS /powershell-docker> docker run -it --rm powershell.local:6.1.0-preview.2-ubuntu-16.04 pwsh -c '$psversiontable'
-
-Name                           Value
-----                           -----
-PSVersion                      6.0.2
-PSEdition                      Core
-GitCommitId                    v6.0.2
-OS                             Linux 4.9.87-linuxkit-aufs #1 SMP Wed Mar 14 15:12:16 UTC 2018
-Platform                       Unix
-PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0...}
-PSRemotingProtocolVersion      2.3
-SerializationVersion           1.1.0.1
-WSManStackVersion              3.0
-```
-
 ## NanoServer-Insider Release Notes
 
 Please be sure to use a build from the Windows Insider program, either [Windows Server Insider](https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver) or the [Windows 10 Insider](https://insider.windows.com/GettingStarted),
@@ -137,7 +95,8 @@ Also make sure to check out our [PowerShell-RFC repository](https://github.com/p
 [known issues]: https://github.com/PowerShell/PowerShell/tree/master/docs/KNOWNISSUES.md
 [GitHub issues]: https://github.com/PowerShell/PowerShell/issues
 [new issue]:https://github.com/PowerShell/PowerShell/issues/new
-[development]: https://github.com/PowerShell/PowerShell-Docker/tree/master/docs/development.md
+[development]: https://github.com/PowerShell/PowerShell-Docker/blob/master/docs/development.md
+
 ## Legal and Licensing
 
 PowerShell is licensed under the [MIT license][].
diff --git a/MAINTAINERS b/docs/MAINTAINERS
similarity index 100%
rename from MAINTAINERS
rename to docs/MAINTAINERS
diff --git a/assets/README.powershell.md b/docs/README.powershell.md
similarity index 100%
rename from assets/README.powershell.md
rename to docs/README.powershell.md
diff --git a/assets/README.powershellcommunity.md b/docs/README.powershellcommunity.md
similarity index 99%
rename from assets/README.powershellcommunity.md
rename to docs/README.powershellcommunity.md
index 1de347e73..65906623c 100644
--- a/assets/README.powershellcommunity.md
+++ b/docs/README.powershellcommunity.md
@@ -24,6 +24,7 @@ $ docker pull pshorg/powershellcommunity
   * Tags: `blackarch-2018.10.01` , `6.1.1-blackarch-2018.10.01`
   * Dockerfile: [/release/community-stable/blackarch/docker/Dockerfile][blackarch-linux-stable-dockerfile]
   * Example: `docker pull pshorg/powershellcommunity:blackarch-2018.10.01`
+<!-- Broken
 * **[Clear Linux][clear-linux-uri]**
   * Tags: `clearlinux-base` , `6.1.1-clearlinux-base`
   * Dockerfile: [/release/community-stable/clearlinux/docker/Dockerfile][clear-linux-stable-dockerfile]
@@ -32,14 +33,17 @@ $ docker pull pshorg/powershellcommunity
   * Tags: `kali-kali-rolling` , `6.1.1-kali-kali-rolling`
   * Dockerfile: [/release/community-stable/kali-rolling/docker/Dockerfile][kali-linux-stable-dockerfile]
   * Example: `docker pull pshorg/powershellcommunity:kali-kali-rolling`
+-->
 * **[Oracle Linux][oracle-linux-uri]**
   * Tags: `oraclelinux-7.5` , `6.1.1-oraclelinux-7.5`
   * Dockerfile: [/release/community-stable/oraclelinux/docker/Dockerfile][oracle-linux-stable-dockerfile]
   * Example: `docker pull pshorg/powershellcommunity:oraclelinux-7.5`
+<!-- Broken
 * **[Parrot Linux][parrotsec-linux-uri]**
   * Tags: `parrot-4.2.2` , `6.1.1-parrot-4.2.2`
   * Dockerfile: [/release/community-stable/parrot/docker/Dockerfile][parrotsec-linux-stable-dockerfile]
   * Example: `docker pull pshorg/powershellcommunity:parrot-4.2.2`
+-->
 * **[Photon Linux][parrotsec-linux-uri]**
   * Tags: `photon-2.0` , `6.1.1-photon-2.0`
   * Dockerfile: [/release/community-stable/photon/docker/Dockerfile][photon-linux-stable-dockerfile]
diff --git a/assets/about_readme.powershell.md b/docs/about_readme.powershell.md
similarity index 89%
rename from assets/about_readme.powershell.md
rename to docs/about_readme.powershell.md
index e4fc7ae99..72c484a5f 100644
--- a/assets/about_readme.powershell.md
+++ b/docs/about_readme.powershell.md
@@ -5,7 +5,7 @@
 Changing the headings including the order requires an offline review.
 Please consider carefully if a change is needed.
 
-## The  `Full Tag Listing` section
+## The `Full Tag Listing` section
 
 The `Full Tag Listing` section is automatically populated.
 It relies on three lines which look like this:
diff --git a/docs/development.md b/docs/development.md
index 4eaf233e1..717d9099e 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -1,5 +1,47 @@
 # Development
 
+## Building the images
+
+To build an image run `./build.ps1 -build -name <ImageFolderName>`.
+
+### Example
+
+For example to build Ubuntu 16.04/xenial, which is in `./release/stable/ubuntu16.04`:
+
+```sh
+PS /powershell-docker> ./build.ps1 -Build -Name ubuntu16.04
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-16.04 PSversion: 6.0.2
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-trusty PSversion: 6.0.2
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.0.2-ubuntu-trusty-20180531 PSversion: 6.0.2
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-16.04 PSversion: 6.1.0~preview.2
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-trusty PSversion: 6.1.0~preview.2
+VERBOSE: lauching build with fromTag: trusty-20180531 Tag: 6.1.0-preview.2-ubuntu-trusty-20180531 PSversion: 6.1.0~preview.2
+VERBOSE: image name: powershell.local:6.0.2-ubuntu-16.04
+VERBOSE: image name: powershell.local:6.0.2-ubuntu-trusty
+VERBOSE: image name: powershell.local:6.0.2-ubuntu-trusty-20180531
+VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-16.04
+VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-trusty
+VERBOSE: image name: powershell.local:6.1.0-preview.2-ubuntu-trusty-20180531
+```
+
+### Run the Docker image you built
+
+```sh
+PS /powershell-docker> docker run -it --rm powershell.local:6.1.0-preview.2-ubuntu-16.04 pwsh -c '$psversiontable'
+
+Name                           Value
+----                           -----
+PSVersion                      6.0.2
+PSEdition                      Core
+GitCommitId                    v6.0.2
+OS                             Linux 4.9.87-linuxkit-aufs #1 SMP Wed Mar 14 15:12:16 UTC 2018
+Platform                       Unix
+PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0...}
+PSRemotingProtocolVersion      2.3
+SerializationVersion           1.1.0.1
+WSManStackVersion              3.0
+```
+
 ## Adding new Docker image
 
 ### Folder structure

From 57373630d0ddd34cb9852af9b8639b1db0ccc91a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 22 Apr 2020 13:33:20 -0700
Subject: [PATCH 056/354] Update alpine image size (#412)

---
 release/lts/alpine38/meta.json      | 2 +-
 release/lts/alpine39/meta.json      | 2 +-
 release/preview/alpine311/meta.json | 2 +-
 release/preview/alpine38/meta.json  | 2 +-
 release/preview/alpine39/meta.json  | 2 +-
 release/stable/alpine38/meta.json   | 2 +-
 release/stable/alpine39/meta.json   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/release/lts/alpine38/meta.json b/release/lts/alpine38/meta.json
index 2b4b5945b..0fc85cdd4 100644
--- a/release/lts/alpine38/meta.json
+++ b/release/lts/alpine38/meta.json
@@ -9,6 +9,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/lts/alpine39/meta.json b/release/lts/alpine39/meta.json
index 077b8bf7d..bf214aa39 100644
--- a/release/lts/alpine39/meta.json
+++ b/release/lts/alpine39/meta.json
@@ -9,6 +9,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 85f6c8894..9433cee52 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/preview/alpine38/meta.json b/release/preview/alpine38/meta.json
index ed06d067d..5608acfc7 100644
--- a/release/preview/alpine38/meta.json
+++ b/release/preview/alpine38/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/preview/alpine39/meta.json b/release/preview/alpine39/meta.json
index 85f6c8894..9433cee52 100644
--- a/release/preview/alpine39/meta.json
+++ b/release/preview/alpine39/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/stable/alpine38/meta.json b/release/stable/alpine38/meta.json
index 5e0d35fbd..48b7ad716 100644
--- a/release/stable/alpine38/meta.json
+++ b/release/stable/alpine38/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }
diff --git a/release/stable/alpine39/meta.json b/release/stable/alpine39/meta.json
index 25f38575d..e4d32f665 100644
--- a/release/stable/alpine39/meta.json
+++ b/release/stable/alpine39/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 165
+        "size": 175
     }
 }

From 97b027c785cfea6a94c518e2795ddcf6358dac36 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Wed, 6 May 2020 17:49:13 -0400
Subject: [PATCH 057/354] Add dockerlint (#407)

Co-Authored-By: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/phase.yml                            | 34 +++++++++++++++++--
 release/lts/debian10/docker/Dockerfile        |  2 +-
 .../lts/debian10/test-deps/docker/Dockerfile  |  2 +-
 release/lts/debian11/docker/Dockerfile        |  2 +-
 .../lts/debian11/test-deps/docker/Dockerfile  |  2 +-
 release/lts/debian9/docker/Dockerfile         |  4 +--
 release/lts/ubuntu16.04/docker/Dockerfile     |  4 +--
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +-
 release/lts/ubuntu18.04/docker/Dockerfile     |  4 +--
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +-
 release/preview/debian10/docker/Dockerfile    |  2 +-
 .../debian10/test-deps/docker/Dockerfile      |  2 +-
 release/preview/debian11/docker/Dockerfile    |  2 +-
 .../debian11/test-deps/docker/Dockerfile      |  2 +-
 release/preview/debian9/docker/Dockerfile     |  4 +--
 .../debian9/test-deps/docker/Dockerfile       |  2 +-
 release/preview/ubuntu16.04/docker/Dockerfile |  4 +--
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +-
 release/preview/ubuntu18.04/docker/Dockerfile |  4 +--
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +-
 release/stable/debian10/docker/Dockerfile     |  2 +-
 .../debian10/test-deps/docker/Dockerfile      |  2 +-
 release/stable/debian11/docker/Dockerfile     |  2 +-
 .../debian11/test-deps/docker/Dockerfile      |  2 +-
 release/stable/debian9/docker/Dockerfile      |  4 +--
 .../debian9/test-deps/docker/Dockerfile       |  2 +-
 release/stable/ubuntu16.04/docker/Dockerfile  |  4 +--
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +-
 release/stable/ubuntu18.04/docker/Dockerfile  |  4 +--
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +-
 .../unstable/kali-rolling/docker/Dockerfile   |  6 ++--
 release/unstable/parrot/docker/Dockerfile     |  4 +--
 32 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index c8dd4141b..0dcbbc184 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -1,6 +1,6 @@
 parameters:
   name: ''
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-18.04'
   continueonerror: false
   ciParameter: '-CI'
   useacr: 'false'
@@ -36,13 +36,32 @@ jobs:
       displayName: 'az login'
       condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }
       Install-module pester -Scope CurrentUser -Force
     displayName: Install Pester
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.8'
+    displayName: Setup Python engine
+    condition: succeeded()
+
+  - bash: |
+      git clone https://github.com/RDIL/dockerlint.git
+      cd dockerlint
+      git checkout 0.2.1
+      make install-deps
+      make
+      cd ..
+    displayName: Download dockerlint
+    condition: succeeded()
+
+  - bash: python dockerlint/main.py -d release/${CHANNEL}/${IMAGENAME}/docker/Dockerfile -R
+    displayName: Run dockerlint
+    condition: succeeded()
+
   - pwsh: |
       $extraParams = @{}
       if($env:ACR_NAME)
@@ -76,3 +95,14 @@ jobs:
       testResultsFiles: '**\test*.xml'
       testRunTitle: $(ImageName)
       mergeTestResults: true
+ 
+  - task: PublishTestResults@2
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+    displayName: Publish $(ImageName) dockerlint Results
+    continueOnError: ${{ variables.continueonerror }}
+
+    inputs:
+      testRunner: JUnit
+      testResultsFiles: 'dockerlint.test_RESULTS.xml'
+      testRunTitle: $(ImageName) dockerlint
+      mergeTestResults: true
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index 2480a256b..12d30756d 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/lts/debian10/test-deps/docker/Dockerfile b/release/lts/debian10/test-deps/docker/Dockerfile
index 35918f757..d5b3a47d1 100644
--- a/release/lts/debian10/test-deps/docker/Dockerfile
+++ b/release/lts/debian10/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 21dcfb135..5db09f64b 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/lts/debian11/test-deps/docker/Dockerfile b/release/lts/debian11/test-deps/docker/Dockerfile
index af918cf6e..1f3e4563a 100644
--- a/release/lts/debian11/test-deps/docker/Dockerfile
+++ b/release/lts/debian11/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index 0dbaf77f9..f3d02aa09 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 7e7a14933..59d0e0bfe 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
index cd956e14d..c08a6a6f5 100644
--- a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index f4c23e308..9ef3c4a9d 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
index 629df4a11..ddfb6930c 100644
--- a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 79f5a56e4..0caccb10d 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/preview/debian10/test-deps/docker/Dockerfile b/release/preview/debian10/test-deps/docker/Dockerfile
index 64cbaffbb..2de4090e9 100644
--- a/release/preview/debian10/test-deps/docker/Dockerfile
+++ b/release/preview/debian10/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index a76d8fa5a..a8a761e03 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/preview/debian11/test-deps/docker/Dockerfile
index 647c9ab4b..be48d665f 100644
--- a/release/preview/debian11/test-deps/docker/Dockerfile
+++ b/release/preview/debian11/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index acd2fa935..db5676af6 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile
index ca96239e7..fa8e1abc8 100644
--- a/release/preview/debian9/test-deps/docker/Dockerfile
+++ b/release/preview/debian9/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 649b68a9a..28fe2dfb4 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
index cd956e14d..729657f20 100644
--- a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install -y --no-install-recommends \
         sudo \
         curl \
         wget \
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 18bc2e89f..de2081410 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
index 629df4a11..ddfb6930c 100644
--- a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index 89c4b23a2..ec062f50b 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/stable/debian10/test-deps/docker/Dockerfile b/release/stable/debian10/test-deps/docker/Dockerfile
index 35918f757..d5b3a47d1 100644
--- a/release/stable/debian10/test-deps/docker/Dockerfile
+++ b/release/stable/debian10/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index 119c0b37b..c94f25564 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
     # requied to setup the locale
diff --git a/release/stable/debian11/test-deps/docker/Dockerfile b/release/stable/debian11/test-deps/docker/Dockerfile
index af918cf6e..1f3e4563a 100644
--- a/release/stable/debian11/test-deps/docker/Dockerfile
+++ b/release/stable/debian11/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 59b90423c..19cde79cb 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -17,7 +17,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -30,7 +30,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile
index 9ec961ba7..538dd74c4 100644
--- a/release/stable/debian9/test-deps/docker/Dockerfile
+++ b/release/stable/debian9/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index 591b0ad83..ce0535273 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
index d279be2b2..080e30692 100644
--- a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 894f49023..d8e9a52f2 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -18,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
     # curl is required to grab the Linux package
         curl \
     # less is required for help in powershell
@@ -31,7 +31,7 @@ RUN apt-get update \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
index e899e02eb..e38323577 100644
--- a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
diff --git a/release/unstable/kali-rolling/docker/Dockerfile b/release/unstable/kali-rolling/docker/Dockerfile
index a87ec22ae..4131085d2 100644
--- a/release/unstable/kali-rolling/docker/Dockerfile
+++ b/release/unstable/kali-rolling/docker/Dockerfile
@@ -43,7 +43,7 @@ RUN \
     # Download the Kali repository package and save it
     wget -O /tmp/kali-archive-keyring_2018.2_all.deb --no-check-certificate ${KALI_REPO_KEY_PACKAGE_URL} \
     # install kali package to renew kali repository expired certificate in container image
-    && apt-get install /tmp/kali-archive-keyring_2018.2_all.deb \
+    && apt-get install --no-install-recommends /tmp/kali-archive-keyring_2018.2_all.deb \
     # remove kali package
     && rm -f /tmp/kali-archive-keyring_2018.2_all.deb \
     # Download the libicu57 Debian package and save it
@@ -55,7 +55,7 @@ RUN \
     # update package list
     && apt-get update \
     # install dependencies
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
       # required for HttpClientHandler
       libcurl4 \
       # required for SSL
@@ -73,7 +73,7 @@ RUN \
     # download the powershell package
     && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
     # install powershell package
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     # remove powershell package
     && rm -f /tmp/powershell.deb \
     # intialize powershell module cache
diff --git a/release/unstable/parrot/docker/Dockerfile b/release/unstable/parrot/docker/Dockerfile
index d27eca372..a3262b4bc 100644
--- a/release/unstable/parrot/docker/Dockerfile
+++ b/release/unstable/parrot/docker/Dockerfile
@@ -43,7 +43,7 @@ RUN \
     # update package list
     apt-get update \
     # install dependencies
-    && apt-get install -y \
+    && apt-get install --no-install-recommends -y \
       # required for HttpClientHandler
       libcurl4 \
       # required for help in powershell
@@ -69,7 +69,7 @@ RUN \
     # Download the Debian9 PowerShell Core package and save it
     && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
     # install powershell package
-    && apt-get install -y /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     # remove powershell package
     && rm -f /tmp/powershell.deb \
     # Give all user execute permissions and remove write permissions for others

From 1c0d50b986316c851ae3ab9df23fd306a56fa6dd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 12 May 2020 15:14:23 -0700
Subject: [PATCH 058/354] Add Ubuntu 20.04 (#422)

---
 .dependabot/config.yml                        |   2 +-
 .vsts-ci/releasePhase.yml                     |  19 ++++
 .vsts-ci/releaseStage.yml                     |   2 +-
 .vsts-ci/releasebuild.yml                     |  40 ++++++-
 release/lts/debian11/test-deps/meta.json      |   2 +-
 release/preview/debian11/test-deps/meta.json  |   2 +-
 .../preview/ubuntu18.04/dependabot/Dockerfile |   6 -
 release/preview/ubuntu20.04/docker/Dockerfile | 107 ++++++++++++++++++
 release/preview/ubuntu20.04/meta.json         |  18 +++
 .../ubuntu20.04/test-deps/docker/Dockerfile   |  42 +++++++
 .../preview/ubuntu20.04/test-deps/meta.json   |  16 +++
 release/stable/debian11/test-deps/meta.json   |   2 +-
 tools/buildHelper/buildHelper.psm1            |  44 ++++---
 tools/getDockerTags/getDockerTags.psm1        |  34 +++++-
 14 files changed, 309 insertions(+), 27 deletions(-)
 delete mode 100644 release/preview/ubuntu18.04/dependabot/Dockerfile
 create mode 100644 release/preview/ubuntu20.04/docker/Dockerfile
 create mode 100644 release/preview/ubuntu20.04/meta.json
 create mode 100644 release/preview/ubuntu20.04/test-deps/docker/Dockerfile
 create mode 100644 release/preview/ubuntu20.04/test-deps/meta.json

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index d46a34332..d59f2d75e 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -32,7 +32,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/ubuntu18.04/dependabot"
+    directory: "/release/preview/ubuntu20.04/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index bc9b6b9cb..9ceceebf5 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -26,6 +26,25 @@ jobs:
   displayName: ${{ parameters.jobName }}
 
   steps:
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Build Artifacts'
+    inputs:
+      downloadType: specific
+      itemPattern: buildMeta/**/*.json
+  - powershell: |
+      $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
+      if($json.Count -ge 1)
+      {
+        $jsonText = Get-Content -Path $json.FullName
+        $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+        Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+        Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+      }
+      else{
+        Write-Verbose "Did not find buildmeta json" -verbose
+      }
+    displayName: Set FULL_TAG variable
+
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
     displayName: 'Enable ACR'
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 09eb655cf..3f149b59a 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -7,7 +7,7 @@ parameters:
 
 stages:
   - stage: GenerateYaml_${{ parameters.channel }}
-    dependsOn: []
+    dependsOn: ['GenerateFullTag']
     displayName: Build ${{ parameters.channel }}
     jobs:
     - job: GenerateYaml_${{ parameters.channel }}
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index a01a4c7f2..3a915be1a 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -8,6 +8,25 @@ variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
 stages:
+  - stage: GenerateFullTag
+    displayName: Generate Full Tag
+    jobs:
+    - job: GenerateFullTag
+
+      displayName: Generate Full Tag
+
+      condition: succeededOrFailed()
+      pool:
+        vmImage: ubuntu-latest
+        timeoutInMinutes: 30
+
+      steps:
+      - pwsh: |
+          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/BuildMeta.json'
+          @{
+            FullTag = (Get-Date).ToString("yyyyMMdd")
+          } | ConvertTo-Json | Out-File -Encoding utf8NoBOM -FilePath ./BuildMeta.json
+          Write-Host "##vso[artifact.upload containerfolder=buildMeta;artifactname=buildMeta]$path"
   - template: releaseStage.yml
     parameters:
       channel: stable
@@ -54,7 +73,7 @@ stages:
       - template: manifestSteps.yml
 
   - stage: GenerateTagsYaml
-    dependsOn: []
+    dependsOn: ['GenerateFullTag']
     jobs:
     - job: GenerateTagsYaml
 
@@ -66,6 +85,25 @@ stages:
         timeoutInMinutes: 30
 
       steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: 'Download Build Artifacts'
+        inputs:
+          downloadType: specific
+          itemPattern: buildMeta/**/*.json
+      - powershell: |
+          $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
+          if($json.Count -ge 1)
+          {
+            $jsonText = Get-Content -Path $json.FullName
+            $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+            Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+            Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+          }
+          else{
+            Write-Verbose "Did not find buildmeta json" -verbose
+          }
+        displayName: Set FULL_TAG variable
+
       - powershell: |
           $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
           Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
diff --git a/release/lts/debian11/test-deps/meta.json b/release/lts/debian11/test-deps/meta.json
index 05b99bc75..7ad958282 100644
--- a/release/lts/debian11/test-deps/meta.json
+++ b/release/lts/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }
diff --git a/release/preview/debian11/test-deps/meta.json b/release/preview/debian11/test-deps/meta.json
index 568f4e2b2..66c8f269a 100644
--- a/release/preview/debian11/test-deps/meta.json
+++ b/release/preview/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }
diff --git a/release/preview/ubuntu18.04/dependabot/Dockerfile b/release/preview/ubuntu18.04/dependabot/Dockerfile
deleted file mode 100644
index 2f686eca8..000000000
--- a/release/preview/ubuntu18.04/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM ubuntu:18.04
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
new file mode 100644
index 000000000..7ef4f41cf
--- /dev/null
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -0,0 +1,107 @@
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.4
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=6.2.0-preview.3
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
new file mode 100644
index 000000000..33ab7c5fe
--- /dev/null
+++ b/release/preview/ubuntu20.04/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "20.04"}
+    ],
+    "tagTemplates": [
+        "#psversion#-ubuntu-#tag#",
+        "preview-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..bbe1bb8c5
--- /dev/null
+++ b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile
@@ -0,0 +1,42 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-20.04
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/ubuntu20.04/test-deps/meta.json b/release/preview/ubuntu20.04/test-deps/meta.json
new file mode 100644
index 000000000..daa8a5151
--- /dev/null
+++ b/release/preview/ubuntu20.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/stable/debian11/test-deps/meta.json b/release/stable/debian11/test-deps/meta.json
index 24f5a7c54..4532e5500 100644
--- a/release/stable/debian11/test-deps/meta.json
+++ b/release/stable/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index eb07f28b1..26a40fb49 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1,9 +1,14 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Gets the current version of PowerShell from the PowerShell repo
 # or formats the version based on the parameters
 
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path $parent -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath -Force
+
 function Get-PowerShellVersion
 {
     [CmdletBinding(DefaultParameterSetName='Default')]
@@ -428,10 +433,11 @@ function Get-DockerImageMetaDataWrapper
     $scriptPath = Join-Path -Path $imagePath -ChildPath 'getLatestTag.ps1'
     $metaJsonPath = Join-Path -Path $imagePath -ChildPath 'meta.json'
 
-    # skip an image if it doesn't exist
-    if(!(Test-Path $scriptPath) -and !$TagData)
-    {
-        return
+    if ($env:FULL_TAG) {
+        $fullTag = $env:FULL_TAG
+    }
+    else {
+        $fullTag = (Get-Date).ToString("yyyyMMdd")
     }
 
     $meta = Get-DockerImageMetaData -Path $metaJsonPath
@@ -458,17 +464,27 @@ function Get-DockerImageMetaDataWrapper
 
     if(!$TagData)
     {
-        # Get the tag data for the image
-        $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
-        Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
-        if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
+        if((Test-Path $scriptPath) )
         {
-            throw "Did not get tag data from script for $scriptPath!"
-        }
+            # Get the tag data for the image
+            $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
+            Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
+            if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
+            {
+                throw "Did not get tag data from script for $scriptPath!"
+            }
 
-        if($TagFilter)
-        {
-            $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
+            if($TagFilter)
+            {
+                $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
+            }
+        }
+        else {
+            Write-Verbose "getting docker tag list" -Verbose
+            if($shortTags)
+            {
+                $tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag
+            }
         }
     }
     elseif ($meta.TagMapping)
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index a48ddff10..f8d427ab7 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -41,6 +41,37 @@ function Get-DockerTagsList
     }
 }
 
+function Get-DockerTagList
+{
+    param(
+        [Parameter(Mandatory)]
+        [string[]] $ShortTag,
+        [Parameter(Mandatory)]
+        [string] $fullTag
+    )
+    $results = @()
+
+    foreach($tag in $ShortTag)
+    {
+        $results += [UpstreamDockerTagData] @{
+            Type = 'Short'
+            Tag = $tag
+            FromTag = 'notUsed'
+        }
+    }
+
+    # Return the full form of the tag
+    $results += [UpstreamDockerTagData] @{
+        Type = 'Full'
+        Tag = $fullTag
+        FromTag = 'notUsed'
+    }
+
+    Write-Verbose "returning $($results.count)" -Verbose
+
+    return $results
+}
+
 class UpstreamDockerTagData
 {
     [string] $Type
@@ -156,6 +187,7 @@ function Get-DockerTags
 }
 
 Export-ModuleMember -Function @(
-    'Get-DockerTags',
+    'Get-DockerTags'
     'Get-DockerTagsList'
+    'Get-DockerTagList'
 )

From 7d20d989eb9b3f69af9e9af7325532a26b482526 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 May 2020 16:55:20 -0700
Subject: [PATCH 059/354] increase image sizes for 7.1 preview 4 release (#425)

---
 .vsts-ci/releasebuild.yml                     | 1 +
 release/preview/alpine311/meta.json           | 2 +-
 release/preview/alpine311/test-deps/meta.json | 2 +-
 release/preview/alpine38/meta.json            | 2 +-
 release/preview/alpine38/test-deps/meta.json  | 2 +-
 release/preview/alpine39/meta.json            | 2 +-
 release/preview/alpine39/test-deps/meta.json  | 2 +-
 release/preview/centos8/meta.json             | 2 +-
 release/preview/centos8/test-deps/meta.json   | 2 +-
 tests/container.tests.ps1                     | 4 ++++
 10 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3a915be1a..81b69e1f4 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -6,6 +6,7 @@ resources:
 
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
+  DOCKER_RELEASE: true
 
 stages:
   - stage: GenerateFullTag
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 9433cee52..3b5562144 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 175
+        "size": 210
     }
 }
diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
index d072f7123..ac78bc6dd 100644
--- a/release/preview/alpine311/test-deps/meta.json
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 225
+        "size": 263
     },
     "TagMapping": {
         "^.*-alpine-3.11$" : "preview-alpine-3.11"
diff --git a/release/preview/alpine38/meta.json b/release/preview/alpine38/meta.json
index 5608acfc7..8fc3ebb6e 100644
--- a/release/preview/alpine38/meta.json
+++ b/release/preview/alpine38/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 175
+        "size": 212
     }
 }
diff --git a/release/preview/alpine38/test-deps/meta.json b/release/preview/alpine38/test-deps/meta.json
index 54ff28c1e..43d618fd3 100644
--- a/release/preview/alpine38/test-deps/meta.json
+++ b/release/preview/alpine38/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 225
+        "size": 264
     }
 }
diff --git a/release/preview/alpine39/meta.json b/release/preview/alpine39/meta.json
index 9433cee52..ca34bd91d 100644
--- a/release/preview/alpine39/meta.json
+++ b/release/preview/alpine39/meta.json
@@ -10,6 +10,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 175
+        "size": 211
     }
 }
diff --git a/release/preview/alpine39/test-deps/meta.json b/release/preview/alpine39/test-deps/meta.json
index 361a1325b..a4fdb1d17 100644
--- a/release/preview/alpine39/test-deps/meta.json
+++ b/release/preview/alpine39/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 225
+        "size": 263
     },
     "TagMapping": {
         "^.*-alpine-3.9$" : "preview-alpine-3.9",
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
index 01a1cf7dc..74f1fd417 100644
--- a/release/preview/centos8/meta.json
+++ b/release/preview/centos8/meta.json
@@ -9,6 +9,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 586
     }
 }
diff --git a/release/preview/centos8/test-deps/meta.json b/release/preview/centos8/test-deps/meta.json
index 84f9bc64f..ac3eacfc3 100644
--- a/release/preview/centos8/test-deps/meta.json
+++ b/release/preview/centos8/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 606
     }
 }
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index dbc0af666..bb9df55aa 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -670,6 +670,10 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 [int]$ExpectedSize
             )
 
+            if ($env:DOCKER_RELEASE) {
+                Set-ItResult -Skipped -Because "Test only used in CI"
+            }
+
             $sizeMb = Get-DockerImageSize -name $name
             Write-Verbose "image is $sizeMb MiB" -Verbose
             if($ExpectedSize -and !$env:RELEASE_DEFINITIONID)

From 55ab1325a1fbdc88a85b68fe8a385dd4b05852ca Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 21 May 2020 03:12:30 +0800
Subject: [PATCH 060/354] Updated ParrotSec (#426)

---
 docs/README.powershellcommunity.md            | 10 +++----
 .../parrotsec}/docker/Dockerfile              | 27 +++++--------------
 release/community-stable/parrotsec/meta.json  | 12 +++++++++
 release/preview/debian11/meta.json            |  2 +-
 release/unstable/parrot/getLatestTag.ps1      | 14 ----------
 release/unstable/parrot/meta.json             | 11 --------
 6 files changed, 25 insertions(+), 51 deletions(-)
 rename release/{unstable/parrot => community-stable/parrotsec}/docker/Dockerfile (82%)
 create mode 100644 release/community-stable/parrotsec/meta.json
 delete mode 100644 release/unstable/parrot/getLatestTag.ps1
 delete mode 100644 release/unstable/parrot/meta.json

diff --git a/docs/README.powershellcommunity.md b/docs/README.powershellcommunity.md
index 65906623c..c311f4b44 100644
--- a/docs/README.powershellcommunity.md
+++ b/docs/README.powershellcommunity.md
@@ -38,12 +38,12 @@ $ docker pull pshorg/powershellcommunity
   * Tags: `oraclelinux-7.5` , `6.1.1-oraclelinux-7.5`
   * Dockerfile: [/release/community-stable/oraclelinux/docker/Dockerfile][oracle-linux-stable-dockerfile]
   * Example: `docker pull pshorg/powershellcommunity:oraclelinux-7.5`
-<!-- Broken
+
 * **[Parrot Linux][parrotsec-linux-uri]**
-  * Tags: `parrot-4.2.2` , `6.1.1-parrot-4.2.2`
+  * Tags: `parrotsec-latest` , `7.0.1-parrotsec-latest`
   * Dockerfile: [/release/community-stable/parrot/docker/Dockerfile][parrotsec-linux-stable-dockerfile]
-  * Example: `docker pull pshorg/powershellcommunity:parrot-4.2.2`
--->
+  * Example: `docker pull pshorg/powershellcommunity:parrotsec-latest`
+
 * **[Photon Linux][parrotsec-linux-uri]**
   * Tags: `photon-2.0` , `6.1.1-photon-2.0`
   * Dockerfile: [/release/community-stable/photon/docker/Dockerfile][photon-linux-stable-dockerfile]
@@ -55,7 +55,7 @@ $ docker pull pshorg/powershellcommunity
 [clear-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/clearlinux/docker/Dockerfile
 [kali-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/kali-rolling/docker/Dockerfile
 [oracle-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/oraclelinux/docker/Dockerfile
-[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrot/docker/Dockerfile
+[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrotsec/docker/Dockerfile
 [photon-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/photon/docker/Dockerfile
 
 [amazon-linux-uri]: https://aws.amazon.com/amazon-linux-2/
diff --git a/release/unstable/parrot/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
similarity index 82%
rename from release/unstable/parrot/docker/Dockerfile
rename to release/community-stable/parrotsec/docker/Dockerfile
index a3262b4bc..40b75c73e 100644
--- a/release/unstable/parrot/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -4,23 +4,16 @@
 # Docker image file that describes an Parrot image with PowerShell
 # installed from Debian9 PowerShell package
 
-# Define arg(s) needed for the From statement
-ARG fromTag=latest
-ARG imageRepo=parrotsec/parrot-core
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM parrotsec/core:latest AS installer-env
 
 # Clear the entrypoint in parrotsec/parrot-core image
 ENTRYPOINT [ ]
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_VERSION=7.0.1
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
-
-# Define Args for the needed to add the package
-ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
+ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -52,18 +45,12 @@ RUN \
       locales \
       # required to support NTLM for PSRemoting
       gss-ntlmssp \
-      # required for dist-upgrade
-      resolvconf \
+      wget \
+      libicu63 \
     # enable en_US.UTF-8 locale
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
     && locale-gen && update-locale \
-    # Download the libicu57 Debian package and save it
-    && wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
-    # install required libicu57 package
-    && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
-    # remove libicu57 package
-    && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # upgrade distro
     && apt-get dist-upgrade -y \
     # Download the Debian9 PowerShell Core package and save it
@@ -91,7 +78,7 @@ RUN \
     && rm -rf /var/lib/apt/lists/*
 
 # Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:parrot-4.4
+ARG IMAGE_NAME=pshorg/powershellcommunity:parrotsec-latest
 ARG VCS_REF="none"
 
 # Add label last as it's just metadata and uses a lot of parameters
diff --git a/release/community-stable/parrotsec/meta.json b/release/community-stable/parrotsec/meta.json
new file mode 100644
index 000000000..e69f0f3c6
--- /dev/null
+++ b/release/community-stable/parrotsec/meta.json
@@ -0,0 +1,12 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell_${PS_VERSION}-1.debian.11_amd64.deb",
+    "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
+    "tagTemplates": [
+        "#psversion#-parrotsec-#tag#",
+        "parrotsec"
+    ]
+}
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index 76d23415b..dc09fa68f 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -10,7 +10,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 314
+        "size": 330
     }
 }
 
diff --git a/release/unstable/parrot/getLatestTag.ps1 b/release/unstable/parrot/getLatestTag.ps1
deleted file mode 100644
index 19d233df0..000000000
--- a/release/unstable/parrot/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the parrot image on
-
-# The versions of parrot we care about
-$shortTags = @('4')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "parrotsec/parrot-core" -FullTagFilter '^4\..*$'
diff --git a/release/unstable/parrot/meta.json b/release/unstable/parrot/meta.json
deleted file mode 100644
index 47d965127..000000000
--- a/release/unstable/parrot/meta.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "IsLinux" : true,
-    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
-    "SkipGssNtlmSspTests": false,
-    "IsBroken": true,
-    "tagTemplates": [
-        "#psversion#-parrot-#tag#",
-        "parrot-#shorttag#"
-    ],
-    "continueOnError": true
-}

From 0095f3f1d480f0542435adc0948ee1cb41b535cf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 20 May 2020 12:13:27 -0700
Subject: [PATCH 061/354] Make known issues clearer in readme and issues
 template (#424)

---
 .github/ISSUE_TEMPLATE.md |  6 +++++-
 README.md                 | 26 ++------------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4153c109d..9d56e9b5b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,12 +4,16 @@ For Windows PowerShell 5.1 issues, suggestions, or feature requests please use t
 - Windows PowerShell [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
 
 If it is a bug report:
-- make sure you are able to repro it on the latest released version. 
+- make sure you are able to repro it on the latest released version.
 - Search the existing issues.
 - Fill out the following repro template:
 
 If it's not a bug, please remove the template and elaborate the issue in your own words.
 -->
+## Check list
+
+- [ ] Verified that this is not a [Known Issue](https://github.com/PowerShell/PowerShell-Docker/wiki/Known-Issues)
+- [ ] Verified this is not an issues in the underlying windows container that should be reported to [Windows Container User Voice](https://windowsserver.uservoice.com/forums/304624-containers)
 
 ## Steps to reproduce
 <!-- Please include any docker commands you used to run the image -->
diff --git a/README.md b/README.md
index aa021e8eb..ca825e153 100644
--- a/README.md
+++ b/README.md
@@ -52,31 +52,9 @@ PS /> Write-Host "Hello, World!"
 Hello, World!
 ```
 
-## NanoServer-Insider Release Notes
+## Known Issues
 
-Please be sure to use a build from the Windows Insider program, either [Windows Server Insider](https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver) or the [Windows 10 Insider](https://insider.windows.com/GettingStarted),
-as your Container host before trying to pull this image. Otherwise, pulling this image will **fail**.
-
-Read more about the changes coming to Nano Server in future releases of Windows Server Insider [here](https://docs.microsoft.com/en-us/windows-server/get-started/nano-in-semi-annual-channel).
-
-### This is pre-release software
-
-Windows Server Insider Preview builds may be substantially modified before they are commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
-Some product features and functionality may require additional hardware or software. These builds are for testing purposes only. Microsoft is not obligated to provide any support services for this preview software.
-
-For more information see [Using Insider Container Images](https://github.com/Microsoft/Virtualization-Documentation/blob/live/virtualization/windowscontainers/quick-start/Using-Insider-Container-Images.md)
-and [Build and run an application with or without .NET Core 2.0 or PowerShell Core 6](https://github.com/Microsoft/Virtualization-Documentation/blob/live/virtualization/windowscontainers/quick-start/Nano-RS3-.NET-Core-and-PS.md).
-
-### Known Issues
-
-#### PowerShell Get only works with CurrentUser Scope
-
-Due to [known issues with the nano-server-insider](https://github.com/Microsoft/Virtualization-Documentation/blob/live/virtualization/windowscontainers/quick-start/Insider-Known-Issues.md#build-16237),
-you must specify `-Scope CurrentUser` when using `Install-Module`.  Example:
-
-```powershell
-Install-Module <ModuleName> -Scope CurrentUser
-```
+See [Known Issues](https://github.com/PowerShell/PowerShell-Docker/wiki/Known-Issues)
 
 ## Developing and Contributing
 

From 46f773b4cfd5c80348a7a48b6199d1460c919b57 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 21 May 2020 13:05:23 -0400
Subject: [PATCH 062/354] Update node to v14 (#419)

---
 release/lts/alpine38/dependabot/Dockerfile            | 2 +-
 release/lts/alpine38/test-deps/docker/Dockerfile      | 6 +++---
 release/lts/alpine38/test-deps/meta.json              | 2 +-
 release/lts/alpine39/test-deps/docker/Dockerfile      | 6 +++---
 release/lts/alpine39/test-deps/meta.json              | 2 +-
 release/preview/alpine311/test-deps/docker/Dockerfile | 6 +++---
 release/preview/alpine311/test-deps/meta.json         | 2 +-
 release/preview/alpine38/dependabot/Dockerfile        | 2 +-
 release/preview/alpine38/test-deps/docker/Dockerfile  | 6 +++---
 release/preview/alpine38/test-deps/meta.json          | 2 +-
 release/preview/alpine39/test-deps/docker/Dockerfile  | 6 +++---
 release/preview/alpine39/test-deps/meta.json          | 2 +-
 release/stable/alpine38/dependabot/Dockerfile         | 2 +-
 release/stable/alpine38/test-deps/docker/Dockerfile   | 6 +++---
 release/stable/alpine38/test-deps/meta.json           | 2 +-
 release/stable/alpine39/test-deps/docker/Dockerfile   | 6 +++---
 release/stable/alpine39/test-deps/meta.json           | 2 +-
 17 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/release/lts/alpine38/dependabot/Dockerfile b/release/lts/alpine38/dependabot/Dockerfile
index 1c8c3ded3..e942d14d9 100644
--- a/release/lts/alpine38/dependabot/Dockerfile
+++ b/release/lts/alpine38/dependabot/Dockerfile
@@ -1 +1 @@
-FROM node:10.15.3-alpine
+FROM node:14.3.0-alpine
diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile
index 475dbfdea..df83e1f54 100644
--- a/release/lts/alpine38/test-deps/docker/Dockerfile
+++ b/release/lts/alpine38/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
 
-FROM node:10.15.3-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=14.0.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
 
diff --git a/release/lts/alpine38/test-deps/meta.json b/release/lts/alpine38/test-deps/meta.json
index 9ac39a65b..b4f07326c 100644
--- a/release/lts/alpine38/test-deps/meta.json
+++ b/release/lts/alpine38/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 254
     }
 }
diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile
index 94637a9f1..b6bd3bf89 100644
--- a/release/lts/alpine39/test-deps/docker/Dockerfile
+++ b/release/lts/alpine39/test-deps/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
 
-FROM node:10.15.3-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
@@ -10,8 +10,8 @@ FROM ${BaseImage}
 
 ARG fromTag=3.9
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
 
diff --git a/release/lts/alpine39/test-deps/meta.json b/release/lts/alpine39/test-deps/meta.json
index 5dec6e953..712f66eba 100644
--- a/release/lts/alpine39/test-deps/meta.json
+++ b/release/lts/alpine39/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 254
     },
     "TagMapping": {
         "^.*-alpine-3.9$" : "lts-alpine-3.9",
diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
index c691ccfc9..0ecc05f6a 100644
--- a/release/preview/alpine311/test-deps/docker/Dockerfile
+++ b/release/preview/alpine311/test-deps/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
 
-FROM node:10.18.1-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
@@ -10,8 +10,8 @@ FROM ${BaseImage}
 
 ARG fromTag=3.11
 
-ENV NODE_VERSION=10.18.1 \
-    YARN_VERSION=1.21.1 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
 
diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
index ac78bc6dd..fe14f3c82 100644
--- a/release/preview/alpine311/test-deps/meta.json
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 263
+        "size": 295
     },
     "TagMapping": {
         "^.*-alpine-3.11$" : "preview-alpine-3.11"
diff --git a/release/preview/alpine38/dependabot/Dockerfile b/release/preview/alpine38/dependabot/Dockerfile
index 1c8c3ded3..e942d14d9 100644
--- a/release/preview/alpine38/dependabot/Dockerfile
+++ b/release/preview/alpine38/dependabot/Dockerfile
@@ -1 +1 @@
-FROM node:10.15.3-alpine
+FROM node:14.3.0-alpine
diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile
index dfa8be0b3..4b38aafe0 100644
--- a/release/preview/alpine38/test-deps/docker/Dockerfile
+++ b/release/preview/alpine38/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
 
-FROM node:10.18.1-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=10.18.1 \
-    YARN_VERSION=1.21.1 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
 
diff --git a/release/preview/alpine38/test-deps/meta.json b/release/preview/alpine38/test-deps/meta.json
index 43d618fd3..8c220b258 100644
--- a/release/preview/alpine38/test-deps/meta.json
+++ b/release/preview/alpine38/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 264
+        "size": 297
     }
 }
diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile
index bdbc6185a..b6bd3bf89 100644
--- a/release/preview/alpine39/test-deps/docker/Dockerfile
+++ b/release/preview/alpine39/test-deps/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
 
-FROM node:10.18.1-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
@@ -10,8 +10,8 @@ FROM ${BaseImage}
 
 ARG fromTag=3.9
 
-ENV NODE_VERSION=10.18.1 \
-    YARN_VERSION=1.21.1 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
 
diff --git a/release/preview/alpine39/test-deps/meta.json b/release/preview/alpine39/test-deps/meta.json
index a4fdb1d17..3d4f95d93 100644
--- a/release/preview/alpine39/test-deps/meta.json
+++ b/release/preview/alpine39/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 263
+        "size": 296
     },
     "TagMapping": {
         "^.*-alpine-3.9$" : "preview-alpine-3.9",
diff --git a/release/stable/alpine38/dependabot/Dockerfile b/release/stable/alpine38/dependabot/Dockerfile
index 1c8c3ded3..e942d14d9 100644
--- a/release/stable/alpine38/dependabot/Dockerfile
+++ b/release/stable/alpine38/dependabot/Dockerfile
@@ -1 +1 @@
-FROM node:10.15.3-alpine
+FROM node:14.3.0-alpine
diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile
index 475dbfdea..4b38aafe0 100644
--- a/release/stable/alpine38/test-deps/docker/Dockerfile
+++ b/release/stable/alpine38/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
 
-FROM node:10.15.3-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
 
diff --git a/release/stable/alpine38/test-deps/meta.json b/release/stable/alpine38/test-deps/meta.json
index 7ea9f4cbd..267ad884c 100644
--- a/release/stable/alpine38/test-deps/meta.json
+++ b/release/stable/alpine38/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 255
     }
 }
diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile
index 94637a9f1..b6bd3bf89 100644
--- a/release/stable/alpine39/test-deps/docker/Dockerfile
+++ b/release/stable/alpine39/test-deps/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
 
-FROM node:10.15.3-alpine as node
+FROM node:14.3.0-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
@@ -10,8 +10,8 @@ FROM ${BaseImage}
 
 ARG fromTag=3.9
 
-ENV NODE_VERSION=10.15.3 \
-    YARN_VERSION=1.13.0 \
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
 
diff --git a/release/stable/alpine39/test-deps/meta.json b/release/stable/alpine39/test-deps/meta.json
index 7af6a0869..b8897cdc8 100644
--- a/release/stable/alpine39/test-deps/meta.json
+++ b/release/stable/alpine39/test-deps/meta.json
@@ -11,7 +11,7 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 212
+        "size": 255
     },
     "TagMapping": {
         "^.*-alpine-3.9$" : "alpine-3.9",

From 806398d227a2153231e3bc96a217d4f353acd6fe Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 22 May 2020 01:07:27 +0800
Subject: [PATCH 063/354] Update KaliLinux (#428)

---
 .../kalilinux}/docker/Dockerfile              | 36 +++++--------------
 release/community-stable/kalilinux/meta.json  | 12 +++++++
 .../unstable/kali-rolling/getLatestTag.ps1    | 14 --------
 release/unstable/kali-rolling/meta.json       | 10 ------
 4 files changed, 20 insertions(+), 52 deletions(-)
 rename release/{unstable/kali-rolling => community-stable/kalilinux}/docker/Dockerfile (72%)
 create mode 100644 release/community-stable/kalilinux/meta.json
 delete mode 100644 release/unstable/kali-rolling/getLatestTag.ps1
 delete mode 100644 release/unstable/kali-rolling/meta.json

diff --git a/release/unstable/kali-rolling/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
similarity index 72%
rename from release/unstable/kali-rolling/docker/Dockerfile
rename to release/community-stable/kalilinux/docker/Dockerfile
index 4131085d2..0dae6e832 100644
--- a/release/unstable/kali-rolling/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -2,26 +2,16 @@
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Kali Rolling image with PowerShell
-# installed from Debian9 PowerShell package
+# installed from Debian11 PowerShell package
 
-# Define arg(s) needed for the From statement
-ARG fromTag=kali-rolling
-ARG imageRepo=kalilinux/kali-linux-docker
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM kalilinux/kali-rolling:latest AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_VERSION=7.0.1
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
-# Define Args for the needed to add the package
-ARG KALI_REPO_KEY_PACKAGE_URL=https://http.kali.org/kali/pool/main/k/kali-archive-keyring/kali-archive-keyring_2018.2_all.deb
-
-# Define Args for the needed to add the package
-ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
-
 # Define Args and Env needed to create links
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -40,20 +30,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Installation
 RUN \
-    # Download the Kali repository package and save it
-    wget -O /tmp/kali-archive-keyring_2018.2_all.deb --no-check-certificate ${KALI_REPO_KEY_PACKAGE_URL} \
-    # install kali package to renew kali repository expired certificate in container image
-    && apt-get install --no-install-recommends /tmp/kali-archive-keyring_2018.2_all.deb \
-    # remove kali package
-    && rm -f /tmp/kali-archive-keyring_2018.2_all.deb \
-    # Download the libicu57 Debian package and save it
-    && wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
-    # install required libicu57 package
-    && dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
-    # remove libicu57 package
-    && rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
     # update package list
-    && apt-get update \
+    apt-get update \
     # install dependencies
     && apt-get install --no-install-recommends -y \
       # required for HttpClientHandler
@@ -66,6 +44,8 @@ RUN \
       locales \
       # required to support NTLM for PSRemoting
       gss-ntlmssp \
+      wget \
+      libicu63 \
     # enable en_US.UTF-8 locale
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
@@ -95,7 +75,7 @@ RUN \
     && rm -rf /var/lib/apt/lists/*
 
 # Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:kali-kali-rolling
+ARG IMAGE_NAME=pshorg/powershellcommunity:kalilinux
 ARG VCS_REF="none"
 
 # Add label last as it's just metadata and uses a lot of parameters
diff --git a/release/community-stable/kalilinux/meta.json b/release/community-stable/kalilinux/meta.json
new file mode 100644
index 000000000..34838a665
--- /dev/null
+++ b/release/community-stable/kalilinux/meta.json
@@ -0,0 +1,12 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell_${PS_VERSION}-1.debian.11_amd64.deb",
+    "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
+    "tagTemplates": [
+        "#psversion#-kalilinux-#tag#",
+        "kalilinux"
+    ]
+}
diff --git a/release/unstable/kali-rolling/getLatestTag.ps1 b/release/unstable/kali-rolling/getLatestTag.ps1
deleted file mode 100644
index 266872373..000000000
--- a/release/unstable/kali-rolling/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the kali image on
-
-# The versions of kali we care about
-$shortTags = @('latest')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "kalilinux/kali-rolling" -FullTagFilter '^latest$' -OnlyShortTags
diff --git a/release/unstable/kali-rolling/meta.json b/release/unstable/kali-rolling/meta.json
deleted file mode 100644
index cf9db6c00..000000000
--- a/release/unstable/kali-rolling/meta.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "IsLinux" : true,
-    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
-    "SkipGssNtlmSspTests": false,
-    "IsBroken": true,
-    "tagTemplates": [
-        "#psversion#-kali-#tag#",
-        "kali-#shorttag#"
-    ]    
-}

From 957490ea5dd8a70e9f6698c57e145d5dbfb0740c Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sat, 23 May 2020 04:42:54 +0800
Subject: [PATCH 064/354] Updated ClearLinux (#429)

---
 .../clearlinux/docker/Dockerfile              | 76 +++----------------
 .../clearlinux/meta.json                      |  9 ++-
 release/unstable/clearlinux/getLatestTag.ps1  | 14 ----
 3 files changed, 16 insertions(+), 83 deletions(-)
 rename release/{unstable => community-stable}/clearlinux/docker/Dockerfile (60%)
 rename release/{unstable => community-stable}/clearlinux/meta.json (70%)
 delete mode 100644 release/unstable/clearlinux/getLatestTag.ps1

diff --git a/release/unstable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
similarity index 60%
rename from release/unstable/clearlinux/docker/Dockerfile
rename to release/community-stable/clearlinux/docker/Dockerfile
index adc2f39e1..0f034538f 100644
--- a/release/unstable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -4,69 +4,18 @@
 # Docker image file that describes an Intel Clear Linux image with PowerShell
 # installed from full PowerShell linux tar.gz package
 
-# Define arg(s) needed for the From statement
-ARG fromTag=base
-ARG imageRepo=clearlinux
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM clearlinux:latest AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
+ARG PS_INSTALL_VERSION=7
 
 # Download the PowerShell Core Linux tar.gz and save it
 ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.tar.gz
 
-# Define Args for the needed to add the package
-ARG GNU_LINUX_LESS_PACKAGE_URL=https://ftp.gnu.org/gnu/less/less-530.tar.gz
-
-# Download the less tar.gz and save it
-ADD ${GNU_LINUX_LESS_PACKAGE_URL} /tmp/less.tar.gz
-
 # Define Args and Env needed to create links
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8
-
-# Installation
-RUN \
-    # generate trust store
-    clrtrust generate -f \
-    # install dependencies
-    && swupd bundle-add \
-      # required libstdc++.so.6
-      # required bundle to make less executable
-      os-core-dev \
-      # required libcrypto.so.1.0.0
-      # required libssl.so.1.0.0
-      # required these files to be copied to second stage
-      cryptoprocessor-management \
-    # create less folder
-    && mkdir -p /tmp/less \
-    # uncompress GNU/Linux less tar file
-    && tar zxf /tmp/less.tar.gz -C /tmp/less --strip-components 1 \
-    # make less executable
-    && ./tmp/less/configure \
-    # create powershell folder
-    && mkdir -p ${PS_INSTALL_FOLDER} \
-    # uncompress powershell linux tar file
-    && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/usr/bin/less", "/usr/bin/less"]
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_VERSION=6.1.0
-ARG PS_INSTALL_VERSION=6
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
     # Define ENVs for Localization/Globalization
@@ -79,13 +28,15 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux-${fromTag}
 
+# Installation
 RUN \
-    # generate trust store
-    clrtrust generate -f \
     # install dependencies
-    && swupd bundle-add \
-      # required package for International Components for Unicode
-      runtime-libs-boost \
+    swupd bundle-add \
+      less \
+    # create powershell folder
+    && mkdir -p ${PS_INSTALL_FOLDER} \
+    # uncompress powershell linux tar file
+    && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
@@ -104,13 +55,8 @@ RUN \
     # clean downloaded packages
     && swupd clean --all
 
-# Copy only the files we need from the previous stage after distro upgrade
-# These files are required to resolve SSL issue with Invoke-WebRequest
-COPY --from=installer-env ["/usr/lib64/libcrypto.so.1.0.0", "/usr/lib64/libcrypto.so.1.0.0"]
-COPY --from=installer-env ["/usr/lib64/libssl.so.1.0.0", "/usr/lib64/libssl.so.1.0.0"]
-
 # Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:clearlinux-base
+ARG IMAGE_NAME=pshorg/powershellcommunity:clearlinux-latest
 ARG VCS_REF="none"
 
 # Add label last as it's just metadata and uses a lot of parameters
diff --git a/release/unstable/clearlinux/meta.json b/release/community-stable/clearlinux/meta.json
similarity index 70%
rename from release/unstable/clearlinux/meta.json
rename to release/community-stable/clearlinux/meta.json
index 9284130de..5dea10afe 100644
--- a/release/unstable/clearlinux/meta.json
+++ b/release/community-stable/clearlinux/meta.json
@@ -2,10 +2,11 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
-    "IsBroken": true,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-clearlinux-#tag#",
-        "clearlinux-#shorttag#"
-    ],
-    "continueOnError": true
+        "clearlinux"
+    ]
 }
diff --git a/release/unstable/clearlinux/getLatestTag.ps1 b/release/unstable/clearlinux/getLatestTag.ps1
deleted file mode 100644
index ccb1d805a..000000000
--- a/release/unstable/clearlinux/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the clear linux image on
-
-# The versions of clear linux we care about
-$shortTags = @('base')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "clearlinux" -FullTagFilter '^base$' -OnlyShortTags

From 560c99705770fd74bb6c6edeeec156d386855f7c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 May 2020 13:47:50 -0700
Subject: [PATCH 065/354] change to trigger a PR (#431)

---
 .vsts-ci/communityReleasePhase.yml | 2 +-
 .vsts-ci/phase.yml                 | 4 ++--
 .vsts-ci/releasePhase.yml          | 2 +-
 .vsts-ci/releasebuild.yml          | 2 +-
 build.ps1                          | 2 +-
 tools/.gitpod.Dockerfile           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
index 3c8852e26..cf5199ecb 100644
--- a/.vsts-ci/communityReleasePhase.yml
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -33,7 +33,7 @@ jobs:
     displayName: 'docker login'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: 'Install-module pester -Scope CurrentUser -Force'
+  - pwsh: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
     displayName: 'Install Pester'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 0dcbbc184..b4f526471 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -38,7 +38,7 @@ jobs:
 
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }
-      Install-module pester -Scope CurrentUser -Force
+      Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
     displayName: Install Pester
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
@@ -95,7 +95,7 @@ jobs:
       testResultsFiles: '**\test*.xml'
       testRunTitle: $(ImageName)
       mergeTestResults: true
- 
+
   - task: PublishTestResults@2
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     displayName: Publish $(ImageName) dockerlint Results
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 9ceceebf5..55c57127f 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -99,7 +99,7 @@ jobs:
     displayName: 'Set SasUrl variable'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: 'Install-module pester -Scope CurrentUser -Force'
+  - pwsh: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
     displayName: 'Install Pester'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 81b69e1f4..358af8467 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -117,7 +117,7 @@ stages:
       - powershell: 'Get-ChildItem env:'
         displayName: 'Capture Environment'
 
-      - powershell: 'Install-module pester -Scope CurrentUser -Force'
+      - powershell: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
         displayName: 'Install Pester'
 
       - powershell: |
diff --git a/build.ps1 b/build.ps1
index e39c63026..4b48db118 100755
--- a/build.ps1
+++ b/build.ps1
@@ -472,7 +472,7 @@ End {
 
         if(!(Get-Module -ListAvailable pester -ErrorAction Ignore) -or $ForcePesterInstall.IsPresent)
         {
-            Install-Module -Name pester -Scope CurrentUser -Force
+            Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
         }
 
         Write-Verbose -Message "logging to $logPath" -Verbose
diff --git a/tools/.gitpod.Dockerfile b/tools/.gitpod.Dockerfile
index de7746bbe..a2b460760 100644
--- a/tools/.gitpod.Dockerfile
+++ b/tools/.gitpod.Dockerfile
@@ -4,4 +4,4 @@ USER root
 
 RUN apt-get update \
     && apt-get --yes install docker \
-    && pwsh -NoLogo -NoProfile -c "install-module -Name Pester -Scope CurrentUser -force" 
+    && pwsh -NoLogo -NoProfile -c "Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99"

From fc4c0602042a13b629eff237840a8e09c73fde0c Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 29 May 2020 05:30:51 +0800
Subject: [PATCH 066/354] Updated ArchLinux (#430)

---
 .../archlinux/docker/Dockerfile               | 19 +++++--------------
 .../archlinux/meta.json                       |  5 ++++-
 release/unstable/archlinux/getLatestTag.ps1   | 14 --------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 rename release/{unstable => community-stable}/archlinux/docker/Dockerfile (92%)
 rename release/{unstable => community-stable}/archlinux/meta.json (72%)
 delete mode 100644 release/unstable/archlinux/getLatestTag.ps1

diff --git a/release/unstable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
similarity index 92%
rename from release/unstable/archlinux/docker/Dockerfile
rename to release/community-stable/archlinux/docker/Dockerfile
index 17e0e3b3c..a3dbd026f 100644
--- a/release/unstable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -5,10 +5,7 @@
 # installed from full PowerShell linux tar.gz package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=latest
-ARG imageRepo=archlinux/base
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM archlinux:latest AS installer-env
 
 RUN \
     # create a builduser
@@ -23,8 +20,6 @@ RUN \
     && pacman -S --noconfirm \
       # required sudo
       sudo \
-      # required for uncompressing tar files
-      tar \
       # required to clone gss-ntlmssp git repository
       git \
       # required to make gss-ntlmssp binary package
@@ -44,13 +39,13 @@ RUN \
     && sudo -u builduser bash -c makepkg -s --noconfirm
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
@@ -69,7 +64,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Invoke-WebRequest : Authentication failed" issue when executing using
     # docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ArchLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ArchLinux-latest
 
 # Installation
 RUN \
@@ -81,14 +76,10 @@ RUN \
     && pacman -Syy \
     # install dependencies
     && pacman -S --noconfirm \
-      # required for updating Arch Linux keyring
-      archlinux-keyring \
       # required for International Components for Unicode
       core/icu \
       # required for SSL
       openssl-1.0 \
-      # required for uncompressing tar files
-      tar \
     # install gss-ntlmssp package from the previous stage
     && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
@@ -120,7 +111,7 @@ RUN \
     && yes | pacman -Scc
 
 # Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:archlinux-2018.10.01
+ARG IMAGE_NAME=pshorg/powershellcommunity:archlinux-latest
 ARG VCS_REF="none"
 
 # Add label last as it's just metadata and uses a lot of parameters
diff --git a/release/unstable/archlinux/meta.json b/release/community-stable/archlinux/meta.json
similarity index 72%
rename from release/unstable/archlinux/meta.json
rename to release/community-stable/archlinux/meta.json
index 8e834dff2..8bae2f7ae 100644
--- a/release/unstable/archlinux/meta.json
+++ b/release/community-stable/archlinux/meta.json
@@ -2,8 +2,11 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-archlinux-#tag#",
-        "archlinux-#shorttag#"
+        "archlinux"
     ]
 }
diff --git a/release/unstable/archlinux/getLatestTag.ps1 b/release/unstable/archlinux/getLatestTag.ps1
deleted file mode 100644
index 4ddcb0dac..000000000
--- a/release/unstable/archlinux/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the arch image on
-
-# The versions of arch linux we care about
-$shortTags = @('latest')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "archlinux/base" -FullTagFilter '^latest$' -OnlyShortTags

From 23ea04d8d095735d73b57e91e19ece5c08fe4d17 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Mon, 1 Jun 2020 15:46:56 -0400
Subject: [PATCH 067/354] Remove the usage labels (#435)

---
 .../amazonlinux/docker/Dockerfile             |   6 +-
 .../archlinux/docker/Dockerfile               |   6 +-
 .../clearlinux/docker/Dockerfile              |   6 +-
 .../kalilinux/docker/Dockerfile               |   6 +-
 .../oraclelinux/docker/Dockerfile             |   6 +-
 .../parrotsec/docker/Dockerfile               |   6 +-
 .../community-stable/photon/docker/Dockerfile |   6 +-
 release/lts/alpine38/docker/Dockerfile        |   6 +-
 release/lts/alpine39/docker/Dockerfile        |   6 +-
 release/lts/arm32v7/docker/Dockerfile         |   6 +-
 release/lts/centos7/docker/Dockerfile         |   6 +-
 release/lts/centos8/docker/Dockerfile         |   6 +-
 release/lts/debian10/docker/Dockerfile        |   6 +-
 release/lts/debian11/docker/Dockerfile        |   6 +-
 release/lts/debian9/docker/Dockerfile         |   6 +-
 release/lts/fedora/docker/Dockerfile          |   6 +-
 release/lts/nanoserver1809/docker/Dockerfile  |   6 +-
 release/lts/ubuntu16.04/docker/Dockerfile     |   6 +-
 release/lts/ubuntu18.04/docker/Dockerfile     |   6 +-
 .../lts/windowsservercore/docker/Dockerfile   |   6 +-
 release/preview/alpine311/docker/Dockerfile   |   6 +-
 release/preview/alpine38/docker/Dockerfile    |   6 +-
 release/preview/alpine39/docker/Dockerfile    |   6 +-
 release/preview/arm32v7/docker/Dockerfile     |   6 +-
 release/preview/centos7/docker/Dockerfile     |   6 +-
 release/preview/centos8/docker/Dockerfile     |   6 +-
 release/preview/debian10/docker/Dockerfile    |   6 +-
 release/preview/debian11/docker/Dockerfile    |   6 +-
 release/preview/debian9/docker/Dockerfile     |   6 +-
 release/preview/fedora/docker/Dockerfile      |   6 +-
 .../preview/nanoserver1809/docker/Dockerfile  |   6 +-
 release/preview/ubuntu16.04/docker/Dockerfile |   6 +-
 release/preview/ubuntu18.04/docker/Dockerfile |   6 +-
 release/preview/ubuntu20.04/docker/Dockerfile |   6 +-
 .../windowsservercore/docker/Dockerfile       |   6 +-
 release/servicing/alpine/docker/Dockerfile    |   6 +-
 release/servicing/arm32v7/docker/Dockerfile   |  21 ---
 release/servicing/centos7/docker/Dockerfile   |   6 +-
 release/servicing/debian9/docker/Dockerfile   |   6 +-
 .../nanoserver1809/docker/Dockerfile          |   6 +-
 .../servicing/opensuse423/docker/Dockerfile   |   6 +-
 .../servicing/ubuntu16.04/docker/Dockerfile   |   6 +-
 .../servicing/ubuntu18.04/docker/Dockerfile   |   6 +-
 .../windowsservercore/docker/Dockerfile       |   6 +-
 release/stable/alpine38/docker/Dockerfile     |   6 +-
 release/stable/alpine39/docker/Dockerfile     |   6 +-
 release/stable/arm32v7/docker/Dockerfile      |   6 +-
 release/stable/centos7/docker/Dockerfile      |   6 +-
 release/stable/centos8/docker/Dockerfile      |   6 +-
 release/stable/debian10/docker/Dockerfile     |   6 +-
 release/stable/debian11/docker/Dockerfile     |   6 +-
 release/stable/debian9/docker/Dockerfile      |   6 +-
 release/stable/fedora/docker/Dockerfile       |   6 +-
 .../stable/nanoserver1809/docker/Dockerfile   |   6 +-
 release/stable/ubuntu16.04/docker/Dockerfile  |   6 +-
 release/stable/ubuntu18.04/docker/Dockerfile  |   6 +-
 .../windowsservercore/docker/Dockerfile       |   6 +-
 tests/container.tests.ps1                     | 146 ------------------
 tests/containerTestCommon.psm1                |  18 ---
 59 files changed, 56 insertions(+), 465 deletions(-)
 delete mode 100644 release/servicing/arm32v7/docker/Dockerfile

diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 4aaff8b0f..f759f7582 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -79,10 +79,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index a3dbd026f..98a047ecf 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -125,10 +125,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
index 0f034538f..d99305461 100644
--- a/release/community-stable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -70,10 +70,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index 0dae6e832..92c4a7195 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -89,10 +89,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 2cf8b36ea..8ce92a536 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -79,10 +79,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index 40b75c73e..f4f42f8c8 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -92,10 +92,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index 3ca3667d7..a3c888394 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -113,10 +113,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/docker/Dockerfile b/release/lts/alpine38/docker/Dockerfile
index bc69ecfe9..2ff0b06e3 100644
--- a/release/lts/alpine38/docker/Dockerfile
+++ b/release/lts/alpine38/docker/Dockerfile
@@ -101,10 +101,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
index cdb172917..f5a738262 100644
--- a/release/lts/alpine39/docker/Dockerfile
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -103,10 +103,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
index f60c2b0e7..8e5617eea 100644
--- a/release/lts/arm32v7/docker/Dockerfile
+++ b/release/lts/arm32v7/docker/Dockerfile
@@ -84,11 +84,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index ff1f845ff..c0fee6b29 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -63,11 +63,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index 314e476b1..48861e1dd 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index 12d30756d..27ddcc83e 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -101,11 +101,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 5db09f64b..0262aad62 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -101,11 +101,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index f3d02aa09..cf39d2dd1 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -67,11 +67,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
index 0c4d7c716..d50997dd5 100644
--- a/release/lts/fedora/docker/Dockerfile
+++ b/release/lts/fedora/docker/Dockerfile
@@ -99,11 +99,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
index c92e961e0..fae758657 100755
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -96,10 +96,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD ["pwsh.exe"]
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 59d0e0bfe..68334eaaa 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 9ef3c4a9d..1d79f2b67 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore/docker/Dockerfile
index 748f31242..f041525ef 100755
--- a/release/lts/windowsservercore/docker/Dockerfile
+++ b/release/lts/windowsservercore/docker/Dockerfile
@@ -78,8 +78,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index a798f424d..f3f50b248 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -103,10 +103,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/preview/alpine38/docker/Dockerfile b/release/preview/alpine38/docker/Dockerfile
index b31b4d5b1..c7084b156 100644
--- a/release/preview/alpine38/docker/Dockerfile
+++ b/release/preview/alpine38/docker/Dockerfile
@@ -101,10 +101,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 2be346159..24d50b10b 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -103,10 +103,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
index d86b97763..84a707c87 100644
--- a/release/preview/arm32v7/docker/Dockerfile
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -84,11 +84,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index b01b93854..35ecd31d1 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index 4fa59ad8a..8af45b6c1 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -65,11 +65,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 0caccb10d..0de8f4e29 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -99,11 +99,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index a8a761e03..ca606c930 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -99,11 +99,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index db5676af6..85c94534f 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -68,11 +68,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index fcdf8e19d..a215f2431 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -100,11 +100,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index c92e961e0..fae758657 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -96,10 +96,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD ["pwsh.exe"]
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 28fe2dfb4..99724903e 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -65,11 +65,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index de2081410..dc3bd006c 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -65,11 +65,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index 7ef4f41cf..caf9d7603 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -96,11 +96,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile
index ac32a1c3c..75a2b4743 100755
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore/docker/Dockerfile
@@ -78,8 +78,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
diff --git a/release/servicing/alpine/docker/Dockerfile b/release/servicing/alpine/docker/Dockerfile
index ab20302d2..aedd4353b 100644
--- a/release/servicing/alpine/docker/Dockerfile
+++ b/release/servicing/alpine/docker/Dockerfile
@@ -97,10 +97,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/servicing/arm32v7/docker/Dockerfile b/release/servicing/arm32v7/docker/Dockerfile
deleted file mode 100644
index d4f77c519..000000000
--- a/release/servicing/arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-FROM arm32v7/ubuntu:bionic
-
-ENV PS_VERSION=6.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 wget --yes \
-  && wget https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} \
-  && mkdir ~/powershell \
-  && tar -xvf ./${PS_PACKAGE} -C ~/powershell \
-  && rm -rf ./${PS_PACKAGE} \
-  && ln -s /root/powershell/pwsh /usr/bin/pwsh \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-ENTRYPOINT ["pwsh"]
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index 7b8d4cc6e..43a7f8ae0 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -59,11 +59,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index 59b90423c..a9485a1d1 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -66,11 +66,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index d5fd31ed8..138e5b615 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -53,11 +53,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index b51289511..78a009937 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -97,10 +97,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.vcs-ref=${VCS_REF} \
       org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index edd1aba94..7a444019e 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -63,11 +63,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index be0b79883..567088bf2 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -63,11 +63,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index 6909666ae..ff8902507 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -77,8 +77,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
index cd337f720..74602ab8e 100644
--- a/release/stable/alpine38/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -99,10 +99,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index a06d1b12a..76e2bd867 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -101,10 +101,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
     org.label-schema.vendor="PowerShell" \
     org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-    org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-    org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-    org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+    org.label-schema.schema-version="1.0"
 
 CMD [ "pwsh" ]
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 7b95789ed..28471c113 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -82,11 +82,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index 7b8d4cc6e..43a7f8ae0 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -59,11 +59,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index 10f6437d3..a7b80f8c6 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -65,11 +65,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index ec062f50b..b856968a7 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -99,11 +99,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index c94f25564..7af270acb 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -99,11 +99,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 19cde79cb..75c6ca168 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -66,11 +66,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
index 206952e86..f4b08f7ad 100644
--- a/release/stable/fedora/docker/Dockerfile
+++ b/release/stable/fedora/docker/Dockerfile
@@ -100,11 +100,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index 51c74f421..77a8ec890 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -96,10 +96,6 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
 
 CMD ["pwsh.exe"]
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index ce0535273..f9f8ab86a 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index d8e9a52f2..1a97dd5f3 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -64,11 +64,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.vendor="PowerShell" \
       org.label-schema.version=${PS_VERSION} \
       org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.vcs-ref=${VCS_REF}
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile
index 59ae550b5..1ed47ddc9 100755
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore/docker/Dockerfile
@@ -78,8 +78,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
       org.label-schema.vendor="PowerShell" `
       org.label-schema.vcs-ref=${VCS_REF} `
       org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0" `
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" `
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" `
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" `
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+      org.label-schema.schema-version="1.0"
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index bb9df55aa..971ba23eb 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -324,90 +324,6 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
         }
     }
 
-    Context "Labels" {
-        BeforeAll {
-            $labelTestCases = @()
-            $script:linuxContainerRunTests | ForEach-Object {
-                $labelTestCases += @{
-                    Name = $_.Name
-                    Label = 'org.label-schema.version'
-                    # The expected value is the version, but replace - or ~ with the regex for - or ~
-                    ExpectedValue = $_.ExpectedVersion  -replace '[\-~]', '[\-~]'
-                    Expectation = 'Match'
-                    UseAcr = [bool]$_.UseAcr
-                }
-                $labelTestCases += @{
-                    Name = $_.Name
-                    Label = 'org.label-schema.vcs-ref'
-                    ExpectedValue = '[0-9a-f]{7}'
-                    Expectation = 'match'
-                    UseAcr = [bool]$_.UseAcr
-                }
-                $labelTestCases += @{
-                    Name = $_.Name
-                    Label = 'org.label-schema.docker.cmd.devel'
-                    ExpectedValue = "docker run $($_.ImageName)"
-                    Expectation = 'BeExactly'
-                    UseAcr = [bool]$_.UseAcr
-                }
-            }
-
-            $script:linuxContainerRunTests | Where-Object { $_.OptionalTests -contains 'test-deps-musl' } | ForEach-Object {
-                $labelTestCases += @{
-                    Name = $_.Name
-                    Label = 'com.azure.dev.pipelines.agent.handler.node.path'
-                    ExpectedValue = "/usr/local/bin/node"
-                    Expectation = 'BeExactly'
-                }
-            }
-        }
-
-        it "Image <Name> should have label <Label> with value: <ExpectedValue>" -TestCases $labelTestCases -Skip:$script:skipLinuxRun {
-            param(
-                [Parameter(Mandatory=$true)]
-                [string]
-                $name,
-
-                [Parameter(Mandatory=$true)]
-                [string[]]
-                $Label,
-
-                [Parameter(Mandatory=$true)]
-                [string]
-                $ExpectedValue,
-
-                [Parameter(Mandatory=$true)]
-                [ValidateSet('Match','BeExactly')]
-                [string]
-                $Expectation,
-
-                [switch]
-                $UseAcr
-            )
-
-            if($env:ACR_NAME -and $UseAcr.IsPresent)
-            {
-                Set-ItResult -Pending -Because "Image is missing when building using ACR"
-            }
-
-            $labelValue = Get-DockerImageLabel -Name $Name -Label $Label
-            $labelValue | Should -Not -BeNullOrEmpty
-
-            switch($Expectation)
-            {
-                'Match' {
-                    $labelValue | Should -Match "'$ExpectedValue'"
-                }
-                'BeExactly' {
-                    $labelValue | Should -BeExactly "'$ExpectedValue'"
-                }
-                default {
-                    throw "Unexpected expactation '$Expectation'"
-                }
-            }
-        }
-    }
-
     Context "permissions" {
         BeforeAll {
             $permissionsTestCases = @(
@@ -778,68 +694,6 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
             $psDistChannel | Should -BeLike "PSDocker-*"
         }
     }
-
-    Context "Labels" {
-        $labelTestCases = @()
-        $script:windowsContainerRunTests | ForEach-Object {
-            $labelTestCases += @{
-                Name = $_.Name
-                Label = 'org.label-schema.version'
-                # The expected value is the version, but replace - or ~ with the regex for - or ~
-                ExpectedValue = $_.ExpectedVersion  -replace '[\-~]', '[\-~]'
-                Expectation = 'Match'
-            }
-            $labelTestCases += @{
-                Name = $_.Name
-                Label = 'org.label-schema.vcs-ref'
-                ExpectedValue = '[0-9a-f]{7}'
-                Expectation = 'match'
-            }
-            $labelTestCases += @{
-                Name = $_.Name
-                Label = 'org.label-schema.docker.cmd.devel'
-                ExpectedValue = "docker run $($_.ImageName)"
-                Expectation = 'BeExactly'
-            }
-        }
-
-        it "Image <Name> should have label: <Label>, with value: <ExpectedValue>" -TestCases $labelTestCases -Skip:$script:skipWindowsRun {
-            param(
-                [Parameter(Mandatory=$true)]
-                [string]
-                $name,
-
-                [Parameter(Mandatory=$true)]
-                [string[]]
-                $Label,
-
-                [Parameter(Mandatory=$true)]
-                [string]
-                $ExpectedValue,
-
-                [Parameter(Mandatory=$true)]
-                [ValidateSet('Match','BeExactly')]
-                [string]
-                $Expectation
-            )
-
-            $labelValue = Get-DockerImageLabel -Name $Name -Label $Label
-            $labelValue | Should -Not -BeNullOrEmpty
-
-            switch($Expectation)
-            {
-                'Match' {
-                    $labelValue | Should -Match "'$ExpectedValue'"
-                }
-                'BeExactly' {
-                    $labelValue | Should -BeExactly "'$ExpectedValue'"
-                }
-                default {
-                    throw "Unexpected expactation '$Expectation'"
-                }
-            }
-        }
-    }
 }
 
 Describe "Push Linux Containers" -Tags 'Linux', 'Push' {
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 753e8bddc..01096cd1f 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -399,24 +399,6 @@ function Get-UICultureUsingContainer
     return Invoke-Docker -Command run -Params $runParams -SuppressHostOutput -PassThru
 }
 
-function Get-DockerImageLabel
-{
-    param(
-        [string] $Name,
-        [String] $Label
-    )
-
-    $imageTag = ${Name}
-
-    $runParams = @()
-    $runParams += '--format'
-
-    $runParams += "'{{ index .Config.Labels \`"$Label\`"}}'"
-    $runParams += $imageTag
-
-    return Invoke-Docker -Command inspect -Params $runParams -SuppressHostOutput -PassThru
-}
-
 # get the Source (path) of a command in a docker container
 function Get-DockerCommandSource
 {

From 8586e21bc6bd6e2c5e133ab2f8ee2fd16c916b5e Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Tue, 2 Jun 2020 03:51:18 +0800
Subject: [PATCH 068/354] Updated BlackArch (#433)

---
 .../blackarch/docker/Dockerfile               | 19 +++++--------------
 .../blackarch/meta.json                       |  5 ++++-
 release/unstable/blackarch/getLatestTag.ps1   | 14 --------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 rename release/{unstable => community-stable}/blackarch/docker/Dockerfile (93%)
 rename release/{unstable => community-stable}/blackarch/meta.json (72%)
 delete mode 100644 release/unstable/blackarch/getLatestTag.ps1

diff --git a/release/unstable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
similarity index 93%
rename from release/unstable/blackarch/docker/Dockerfile
rename to release/community-stable/blackarch/docker/Dockerfile
index ae509d622..63255394f 100644
--- a/release/unstable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -6,10 +6,7 @@
 # package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=latest
-ARG imageRepo=archlinux/base
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM archlinux:latest AS installer-env
 
 RUN \
     # create a builduser
@@ -24,8 +21,6 @@ RUN \
     && pacman -S --noconfirm \
       # required sudo
       sudo \
-      # required for uncompressing tar files
-      tar \
       # required to clone gss-ntlmssp git repository
       git \
       # required to make gss-ntlmssp binary package
@@ -45,7 +40,7 @@ RUN \
     && sudo -u builduser bash -c makepkg -s --noconfirm
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
@@ -57,7 +52,7 @@ ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh
 ADD ${BlackArch_Strap_URL} /tmp/strap.sh
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
@@ -76,7 +71,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Invoke-WebRequest : Authentication failed" issue when executing using
     # docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-BlackArch-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-BlackArch-latest
 
 # Installation
 RUN \
@@ -96,14 +91,10 @@ RUN \
     && pacman -Syy \
     # install dependencies
     && pacman -S --noconfirm \
-      # required for updating Arch Linux keyring
-      archlinux-keyring \
       # required for International Components for Unicode
       core/icu \
       # required for SSL
       openssl-1.0 \
-      # required for uncompressing tar files
-      tar \
     # install gss-ntlmssp package from the previous stage
     && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
     # create powershell folder
@@ -135,7 +126,7 @@ RUN \
     && yes | pacman -Scc
 
 # Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:blackarch-2018.10.01
+ARG IMAGE_NAME=pshorg/powershellcommunity:blackarch-latest
 ARG VCS_REF="none"
 
 # Add label last as it's just metadata and uses a lot of parameters
diff --git a/release/unstable/blackarch/meta.json b/release/community-stable/blackarch/meta.json
similarity index 72%
rename from release/unstable/blackarch/meta.json
rename to release/community-stable/blackarch/meta.json
index 7bec3b377..b5ea2bebb 100644
--- a/release/unstable/blackarch/meta.json
+++ b/release/community-stable/blackarch/meta.json
@@ -2,8 +2,11 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-blackarch-#tag#",
-        "blackarch-#shorttag#"
+        "blackarch"
     ]
 }
diff --git a/release/unstable/blackarch/getLatestTag.ps1 b/release/unstable/blackarch/getLatestTag.ps1
deleted file mode 100644
index 55dccd687..000000000
--- a/release/unstable/blackarch/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the blackarch image on
-
-# The versions of arch linux we care about
-$shortTags = @('latest')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "archlinux/base" -FullTagFilter '^latest$' -OnlyShortTags

From e1aba08372442a056a027e5e4d47385922f2e27f Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Tue, 2 Jun 2020 12:40:42 -0400
Subject: [PATCH 069/354] Finish off the labels (#440)

---
 docs/development.md                           | 41 +------------------
 .../amazonlinux/docker/Dockerfile             | 17 --------
 .../amazonlinux/test-deps/docker/Dockerfile   | 22 ----------
 .../archlinux/docker/Dockerfile               | 17 --------
 .../blackarch/docker/Dockerfile               | 21 ----------
 .../clearlinux/docker/Dockerfile              | 17 --------
 .../kalilinux/docker/Dockerfile               | 17 --------
 .../oraclelinux/docker/Dockerfile             | 17 --------
 .../parrotsec/docker/Dockerfile               | 17 --------
 .../community-stable/photon/docker/Dockerfile | 17 --------
 release/lts/alpine38/docker/Dockerfile        | 18 --------
 .../lts/alpine38/test-deps/docker/Dockerfile  | 22 +---------
 release/lts/alpine39/docker/Dockerfile        | 18 --------
 .../lts/alpine39/test-deps/docker/Dockerfile  | 22 +---------
 release/lts/arm32v7/docker/Dockerfile         | 16 --------
 release/lts/centos7/docker/Dockerfile         | 16 --------
 .../lts/centos7/test-deps/docker/Dockerfile   | 21 ----------
 release/lts/centos8/docker/Dockerfile         | 16 --------
 .../lts/centos8/test-deps/docker/Dockerfile   | 21 ----------
 release/lts/debian10/docker/Dockerfile        | 16 --------
 .../lts/debian10/test-deps/docker/Dockerfile  | 21 ----------
 release/lts/debian11/docker/Dockerfile        | 16 --------
 .../lts/debian11/test-deps/docker/Dockerfile  | 21 ----------
 release/lts/debian9/docker/Dockerfile         | 16 --------
 .../lts/debian9/test-deps/docker/Dockerfile   | 21 ----------
 release/lts/fedora/docker/Dockerfile          | 16 --------
 .../lts/fedora/test-deps/docker/Dockerfile    | 21 ----------
 release/lts/nanoserver1809/docker/Dockerfile  | 14 -------
 release/lts/ubuntu16.04/docker/Dockerfile     | 16 --------
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ----------
 release/lts/ubuntu18.04/docker/Dockerfile     | 16 --------
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ----------
 .../lts/windowsservercore/docker/Dockerfile   | 16 --------
 release/preview/alpine311/docker/Dockerfile   | 18 --------
 .../alpine311/test-deps/docker/Dockerfile     | 22 +---------
 release/preview/alpine38/docker/Dockerfile    | 18 --------
 .../alpine38/test-deps/docker/Dockerfile      | 22 +---------
 release/preview/alpine39/docker/Dockerfile    | 18 --------
 .../alpine39/test-deps/docker/Dockerfile      | 22 +---------
 release/preview/arm32v7/docker/Dockerfile     | 16 --------
 release/preview/centos7/docker/Dockerfile     | 16 --------
 .../centos7/test-deps/docker/Dockerfile       | 21 ----------
 release/preview/centos8/docker/Dockerfile     | 16 --------
 .../centos8/test-deps/docker/Dockerfile       | 21 ----------
 release/preview/debian10/docker/Dockerfile    | 16 --------
 .../debian10/test-deps/docker/Dockerfile      | 21 ----------
 release/preview/debian11/docker/Dockerfile    | 16 --------
 .../debian11/test-deps/docker/Dockerfile      | 21 ----------
 release/preview/debian9/docker/Dockerfile     | 16 --------
 .../debian9/test-deps/docker/Dockerfile       | 21 ----------
 release/preview/fedora/docker/Dockerfile      | 16 --------
 .../fedora/test-deps/docker/Dockerfile        | 21 ----------
 .../preview/nanoserver1809/docker/Dockerfile  | 14 -------
 release/preview/ubuntu16.04/docker/Dockerfile | 16 --------
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ----------
 release/preview/ubuntu18.04/docker/Dockerfile | 16 --------
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ----------
 release/preview/ubuntu20.04/docker/Dockerfile | 16 --------
 .../ubuntu20.04/test-deps/docker/Dockerfile   | 21 ----------
 .../windowsservercore/docker/Dockerfile       | 16 --------
 release/servicing/alpine/docker/Dockerfile    | 18 --------
 release/servicing/centos7/docker/Dockerfile   | 16 --------
 release/servicing/debian9/docker/Dockerfile   | 16 --------
 .../nanoserver1809/docker/Dockerfile          | 16 --------
 .../servicing/opensuse423/docker/Dockerfile   | 18 --------
 .../servicing/ubuntu16.04/docker/Dockerfile   | 16 --------
 .../servicing/ubuntu18.04/docker/Dockerfile   | 16 --------
 .../windowsservercore/docker/Dockerfile       | 16 --------
 release/stable/alpine38/docker/Dockerfile     | 18 --------
 .../alpine38/test-deps/docker/Dockerfile      | 22 +---------
 release/stable/alpine39/docker/Dockerfile     | 18 --------
 .../alpine39/test-deps/docker/Dockerfile      | 22 +---------
 release/stable/arm32v7/docker/Dockerfile      | 16 --------
 release/stable/centos7/docker/Dockerfile      | 16 --------
 .../centos7/test-deps/docker/Dockerfile       | 20 ---------
 release/stable/centos8/docker/Dockerfile      | 16 --------
 .../centos8/test-deps/docker/Dockerfile       | 21 ----------
 release/stable/debian10/docker/Dockerfile     | 16 --------
 .../debian10/test-deps/docker/Dockerfile      | 21 ----------
 release/stable/debian11/docker/Dockerfile     | 16 --------
 .../debian11/test-deps/docker/Dockerfile      | 21 ----------
 release/stable/debian9/docker/Dockerfile      | 16 --------
 .../debian9/test-deps/docker/Dockerfile       | 21 ----------
 release/stable/fedora/docker/Dockerfile       | 16 --------
 .../stable/fedora/test-deps/docker/Dockerfile | 21 ----------
 .../stable/nanoserver1809/docker/Dockerfile   | 16 --------
 release/stable/ubuntu16.04/docker/Dockerfile  | 16 --------
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ----------
 release/stable/ubuntu18.04/docker/Dockerfile  | 16 --------
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ----------
 .../windowsservercore/docker/Dockerfile       | 16 --------
 tools/buildHelper/buildHelper.psm1            |  2 -
 92 files changed, 8 insertions(+), 1673 deletions(-)

diff --git a/docs/development.md b/docs/development.md
index 717d9099e..90aacad5a 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -113,34 +113,6 @@ ARG PS_VERSION=6.0.4
 ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
 ```
 
-* A `VCS_REF` argument should be defined, and used wherever the `git` commit hash is needed.
-
-  For example:
-
-```dockerfile
-ARG VCS_REF="none"
-```
-
-* The following labels should be applied to all images:
-
-```dockerfile
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-```
-
 ## Testing
 
 You should not have to write any specific tests for your image,
@@ -150,18 +122,7 @@ The CI definition is here at `vsts-ci.yml`.
 
 ### Template
 
-Here is a template for an image build job:
-
-```yaml
-- template: .vsts-ci/phase.yml
-  parameters:
-    name: insertImageNameHere
-    imagename: insertImageNameHere
-    stable: false
-    preview: false
-    communityStable: true
-    continueonerror: false
-```
+TODO: Update this
 
 ## Tags
 
diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index f759f7582..2b09e4e0e 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -64,21 +64,4 @@ RUN \
     # remove cache folders and files
     && rm -rf /var/cache/yum
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:amazonlinux-2.0.20181114
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
index e1996daef..ce69ec819 100644
--- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
@@ -30,28 +30,6 @@ RUN \
     # remove cache folders and files
     && rm -rf /var/cache/yum
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity/test-deps:amazonlinux-2.0.20181114
-ARG VCS_REF="none"
-ARG PS_VERSION=6.1.0
-
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux-${fromTag}
 
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index 98a047ecf..56ce053cc 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -110,21 +110,4 @@ RUN \
     # clean downloaded packages
     && yes | pacman -Scc
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:archlinux-latest
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 63255394f..8bf42d49d 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -125,25 +125,4 @@ RUN \
     # clean downloaded packages
     && yes | pacman -Scc
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:blackarch-latest
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
index d99305461..aeeaba615 100644
--- a/release/community-stable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -55,21 +55,4 @@ RUN \
     # clean downloaded packages
     && swupd clean --all
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:clearlinux-latest
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index 92c4a7195..ee6bfd250 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -74,21 +74,4 @@ RUN \
     # remove package list
     && rm -rf /var/lib/apt/lists/*
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:kalilinux
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 8ce92a536..0846241ea 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -64,21 +64,4 @@ RUN \
     # remove cache folders and files
     && rm -rf /var/cache/yum
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:oraclelinux-7.5
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index f4f42f8c8..4ff421ef3 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -77,21 +77,4 @@ RUN \
     # remove package list
     && rm -rf /var/lib/apt/lists/*
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:parrotsec-latest
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index a3c888394..a027dab11 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -98,21 +98,4 @@ RUN \
     # clean cached data
     && tdnf clean all
 
-# Define args needed only for the labels
-ARG IMAGE_NAME=pshorg/powershellcommunity:photon-2.0
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/docker/Dockerfile b/release/lts/alpine38/docker/Dockerfile
index 2ff0b06e3..d2863bb65 100644
--- a/release/lts/alpine38/docker/Dockerfile
+++ b/release/lts/alpine38/docker/Dockerfile
@@ -85,22 +85,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile
index df83e1f54..3d41fcfca 100644
--- a/release/lts/alpine38/test-deps/docker/Dockerfile
+++ b/release/lts/alpine38/test-deps/docker/Dockerfile
@@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
index f5a738262..406350acf 100644
--- a/release/lts/alpine39/docker/Dockerfile
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -87,22 +87,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=7.0.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile
index b6bd3bf89..1fb8267a4 100644
--- a/release/lts/alpine39/test-deps/docker/Dockerfile
+++ b/release/lts/alpine39/test-deps/docker/Dockerfile
@@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
index 8e5617eea..bc792dd67 100644
--- a/release/lts/arm32v7/docker/Dockerfile
+++ b/release/lts/arm32v7/docker/Dockerfile
@@ -70,22 +70,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh-lts symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index c0fee6b29..cd668d6ea 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -49,22 +49,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/centos7/test-deps/docker/Dockerfile b/release/lts/centos7/test-deps/docker/Dockerfile
index 5b9e2fc53..b41a2cefd 100644
--- a/release/lts/centos7/test-deps/docker/Dockerfile
+++ b/release/lts/centos7/test-deps/docker/Dockerfile
@@ -13,27 +13,6 @@ RUN yum install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index 48861e1dd..bf733cce1 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/centos8/test-deps/docker/Dockerfile b/release/lts/centos8/test-deps/docker/Dockerfile
index 5b9e2fc53..b41a2cefd 100644
--- a/release/lts/centos8/test-deps/docker/Dockerfile
+++ b/release/lts/centos8/test-deps/docker/Dockerfile
@@ -13,27 +13,6 @@ RUN yum install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index 27ddcc83e..abb24b745 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -87,22 +87,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian10/test-deps/docker/Dockerfile b/release/lts/debian10/test-deps/docker/Dockerfile
index d5b3a47d1..63bec0248 100644
--- a/release/lts/debian10/test-deps/docker/Dockerfile
+++ b/release/lts/debian10/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 0262aad62..508a95030 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -87,22 +87,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian11/test-deps/docker/Dockerfile b/release/lts/debian11/test-deps/docker/Dockerfile
index 1f3e4563a..96a8b9a38 100644
--- a/release/lts/debian11/test-deps/docker/Dockerfile
+++ b/release/lts/debian11/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index cf39d2dd1..a1f2bf4ae 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -53,22 +53,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/debian9/test-deps/docker/Dockerfile b/release/lts/debian9/test-deps/docker/Dockerfile
index 0abc4fc86..0691eac7d 100644
--- a/release/lts/debian9/test-deps/docker/Dockerfile
+++ b/release/lts/debian9/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
index d50997dd5..db5eb26a1 100644
--- a/release/lts/fedora/docker/Dockerfile
+++ b/release/lts/fedora/docker/Dockerfile
@@ -85,22 +85,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/fedora/test-deps/docker/Dockerfile b/release/lts/fedora/test-deps/docker/Dockerfile
index e0004d29a..656afd0ff 100644
--- a/release/lts/fedora/test-deps/docker/Dockerfile
+++ b/release/lts/fedora/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN dnf install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
index fae758657..94dc98404 100755
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -41,8 +41,6 @@ FROM ${NanoServerRepo}:${fromTag}
 
 ARG fromTag=1709
 
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0-rc.1
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
 # Copy PowerShell Core from the installer container
@@ -86,16 +84,4 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
-
 CMD ["pwsh.exe"]
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 68334eaaa..69a8dd15a 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
index c08a6a6f5..6e8192a52 100644
--- a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
@@ -16,27 +16,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 1d79f2b67..65d0b739e 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
index ddfb6930c..47e76069d 100644
--- a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
@@ -16,27 +16,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore/docker/Dockerfile
index f041525ef..4406d4f96 100755
--- a/release/lts/windowsservercore/docker/Dockerfile
+++ b/release/lts/windowsservercore/docker/Dockerfile
@@ -63,19 +63,3 @@ RUN pwsh `
           }"
 
 CMD ["pwsh.exe"]
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
-ARG VCS_REF="none"
-ARG PS_VERSION=7.0.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index f3f50b248..86880a965 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -87,22 +87,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=7.0.0-preview.1
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.11
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
index 0ecc05f6a..af97ac304 100644
--- a/release/preview/alpine311/test-deps/docker/Dockerfile
+++ b/release/preview/alpine311/test-deps/docker/Dockerfile
@@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.11
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/alpine38/docker/Dockerfile b/release/preview/alpine38/docker/Dockerfile
index c7084b156..681a92b14 100644
--- a/release/preview/alpine38/docker/Dockerfile
+++ b/release/preview/alpine38/docker/Dockerfile
@@ -85,22 +85,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0-preview.2
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile
index 4b38aafe0..83f43feb9 100644
--- a/release/preview/alpine38/test-deps/docker/Dockerfile
+++ b/release/preview/alpine38/test-deps/docker/Dockerfile
@@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 24d50b10b..827bfc462 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -87,22 +87,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0-preview.2
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile
index b6bd3bf89..1fb8267a4 100644
--- a/release/preview/alpine39/test-deps/docker/Dockerfile
+++ b/release/preview/alpine39/test-deps/docker/Dockerfile
@@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
index 84a707c87..229e11ffb 100644
--- a/release/preview/arm32v7/docker/Dockerfile
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -70,22 +70,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh-preview symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-arm32v7-ubuntu-bionic
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index 35ecd31d1..b6004302e 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile
index 5b9e2fc53..b41a2cefd 100644
--- a/release/preview/centos7/test-deps/docker/Dockerfile
+++ b/release/preview/centos7/test-deps/docker/Dockerfile
@@ -13,27 +13,6 @@ RUN yum install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index 8af45b6c1..fbb4b358d 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -51,22 +51,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
index 5b9e2fc53..b41a2cefd 100644
--- a/release/preview/centos8/test-deps/docker/Dockerfile
+++ b/release/preview/centos8/test-deps/docker/Dockerfile
@@ -13,27 +13,6 @@ RUN yum install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 0de8f4e29..20f860b50 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian10/test-deps/docker/Dockerfile b/release/preview/debian10/test-deps/docker/Dockerfile
index 2de4090e9..614166526 100644
--- a/release/preview/debian10/test-deps/docker/Dockerfile
+++ b/release/preview/debian10/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index ca606c930..f8a4b3162 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/preview/debian11/test-deps/docker/Dockerfile
index be48d665f..e3ee94ddc 100644
--- a/release/preview/debian11/test-deps/docker/Dockerfile
+++ b/release/preview/debian11/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 85c94534f..a5c3553ac 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -54,22 +54,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile
index fa8e1abc8..7ab3f2e17 100644
--- a/release/preview/debian9/test-deps/docker/Dockerfile
+++ b/release/preview/debian9/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index a215f2431..91edc1c55 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -86,22 +86,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/fedora/test-deps/docker/Dockerfile b/release/preview/fedora/test-deps/docker/Dockerfile
index e0004d29a..656afd0ff 100644
--- a/release/preview/fedora/test-deps/docker/Dockerfile
+++ b/release/preview/fedora/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN dnf install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index fae758657..94dc98404 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -41,8 +41,6 @@ FROM ${NanoServerRepo}:${fromTag}
 
 ARG fromTag=1709
 
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0-rc.1
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
 # Copy PowerShell Core from the installer container
@@ -86,16 +84,4 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
-
 CMD ["pwsh.exe"]
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 99724903e..727a54d57 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -51,22 +51,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
index 729657f20..09481ed6f 100644
--- a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile
@@ -16,27 +16,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index dc3bd006c..9f3db9364 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -51,22 +51,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
index ddfb6930c..47e76069d 100644
--- a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile
@@ -16,27 +16,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index caf9d7603..f139fa96b 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -82,22 +82,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile
index bbe1bb8c5..d9c7795a7 100644
--- a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/test-deps/docker/Dockerfile
@@ -16,27 +16,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-20.04
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile
index 75a2b4743..b2e9274d6 100755
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore/docker/Dockerfile
@@ -63,19 +63,3 @@ RUN pwsh `
           }"
 
 CMD ["pwsh.exe"]
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0-preview.4
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
diff --git a/release/servicing/alpine/docker/Dockerfile b/release/servicing/alpine/docker/Dockerfile
index aedd4353b..0d27232a3 100644
--- a/release/servicing/alpine/docker/Dockerfile
+++ b/release/servicing/alpine/docker/Dockerfile
@@ -81,22 +81,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index 43a7f8ae0..a68dc88f8 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -45,22 +45,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index a9485a1d1..29954e8d9 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -52,22 +52,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index 138e5b615..922ed5b5d 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -39,22 +39,6 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:${fromTag}
 
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index 78a009937..55d851800 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -81,22 +81,4 @@ RUN zypper --non-interactive update --skip-interactive \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:opensuse-42.3
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index 7a444019e..ada151996 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -49,22 +49,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index 567088bf2..2f48a4b50 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -49,22 +49,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index ff8902507..c9bb2e10c 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -62,19 +62,3 @@ RUN pwsh `
           }"
 
 CMD ["pwsh.exe"]
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
index 74602ab8e..c1e2b281c 100644
--- a/release/stable/alpine38/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -83,22 +83,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=7.0.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile
index 4b38aafe0..83f43feb9 100644
--- a/release/stable/alpine38/test-deps/docker/Dockerfile
+++ b/release/stable/alpine38/test-deps/docker/Dockerfile
@@ -31,27 +31,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index 76e2bd867..ef731b17c 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -85,22 +85,4 @@ RUN apk add --no-cache \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG PS_VERSION=6.2.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
-ARG VCS_REF="none"
-
-# Add label last as it's just metadata and uses a lot of parameters
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-    readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    description="This Dockerfile will install the latest release of PowerShell." \
-    org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-    org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-    org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-    org.label-schema.name="powershell" \
-    org.label-schema.vendor="PowerShell" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    org.label-schema.version=${PS_VERSION} \
-    org.label-schema.schema-version="1.0"
-
 CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile
index b6bd3bf89..1fb8267a4 100644
--- a/release/stable/alpine39/test-deps/docker/Dockerfile
+++ b/release/stable/alpine39/test-deps/docker/Dockerfile
@@ -33,27 +33,7 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:alpine-3.8
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" \
-      com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 28471c113..729716ef3 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -68,22 +68,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index 43a7f8ae0..a68dc88f8 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -45,22 +45,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile
index e170a9230..b41a2cefd 100644
--- a/release/stable/centos7/test-deps/docker/Dockerfile
+++ b/release/stable/centos7/test-deps/docker/Dockerfile
@@ -12,26 +12,6 @@ RUN yum install -y \
     && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=7.0.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index a7b80f8c6..b4dec513f 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -51,22 +51,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:centos-7
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/centos8/test-deps/docker/Dockerfile b/release/stable/centos8/test-deps/docker/Dockerfile
index 5b9e2fc53..b41a2cefd 100644
--- a/release/stable/centos8/test-deps/docker/Dockerfile
+++ b/release/stable/centos8/test-deps/docker/Dockerfile
@@ -13,27 +13,6 @@ RUN yum install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:centos-7
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index b856968a7..0b518bd55 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-10
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian10/test-deps/docker/Dockerfile b/release/stable/debian10/test-deps/docker/Dockerfile
index d5b3a47d1..63bec0248 100644
--- a/release/stable/debian10/test-deps/docker/Dockerfile
+++ b/release/stable/debian10/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index 7af270acb..f2d4733e2 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -85,22 +85,6 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-11
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian11/test-deps/docker/Dockerfile b/release/stable/debian11/test-deps/docker/Dockerfile
index 1f3e4563a..96a8b9a38 100644
--- a/release/stable/debian11/test-deps/docker/Dockerfile
+++ b/release/stable/debian11/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-11
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 75c6ca168..56f4fdc75 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -52,22 +52,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:debian-9
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile
index 538dd74c4..7ab3f2e17 100644
--- a/release/stable/debian9/test-deps/docker/Dockerfile
+++ b/release/stable/debian9/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN apt-get update \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:debian-9
-ARG PS_VERSION=7.0.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
index f4b08f7ad..c3242375b 100644
--- a/release/stable/fedora/docker/Dockerfile
+++ b/release/stable/fedora/docker/Dockerfile
@@ -86,22 +86,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:fedora28
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/fedora/test-deps/docker/Dockerfile b/release/stable/fedora/test-deps/docker/Dockerfile
index e0004d29a..656afd0ff 100644
--- a/release/stable/fedora/test-deps/docker/Dockerfile
+++ b/release/stable/fedora/test-deps/docker/Dockerfile
@@ -17,27 +17,6 @@ RUN dnf install -y \
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:fedora-28
-ARG PS_VERSION=6.2.3
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index 77a8ec890..810777582 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -41,10 +41,6 @@ FROM ${NanoServerRepo}:${fromTag}
 
 ARG fromTag=1709
 
-ARG VCS_REF="none"
-ARG PS_VERSION=7.0.0
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
@@ -86,16 +82,4 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
-
 CMD ["pwsh.exe"]
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index f9f8ab86a..5a9eaed93 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu16.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
index 080e30692..9897b26cb 100644
--- a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
@@ -14,27 +14,6 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-16.04
-ARG PS_VERSION=6.2.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 1a97dd5f3..405875817 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -50,22 +50,6 @@ RUN apt-get update \
             Start-Sleep -Seconds 6 ; \
           }"
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF}
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
index e38323577..092229f24 100644
--- a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
@@ -14,27 +14,6 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Define args needed only for the labels
-ARG VCS_REF="none"
-ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
-ARG PS_VERSION=6.2.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
-      org.label-schema.name="powershell" \
-      org.label-schema.vendor="PowerShell" \
-      org.label-schema.version=${PS_VERSION} \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.vcs-ref=${VCS_REF} \
-      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
-      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
-      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
-      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
-
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile
index 1ed47ddc9..5d3600605 100755
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore/docker/Dockerfile
@@ -63,19 +63,3 @@ RUN pwsh `
           }"
 
 CMD ["pwsh.exe"]
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell:windowsservercore
-ARG VCS_REF="none"
-ARG PS_VERSION=6.2.0
-
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" `
-      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      description="This Dockerfile will install the latest release of PowerShell." `
-      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" `
-      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" `
-      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" `
-      org.label-schema.name="powershell" `
-      org.label-schema.vendor="PowerShell" `
-      org.label-schema.vcs-ref=${VCS_REF} `
-      org.label-schema.version=${PS_VERSION} `
-      org.label-schema.schema-version="1.0"
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 26a40fb49..6ed078f96 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -605,7 +605,6 @@ function Get-TestParams
 
     Write-Verbose -Message "To be tested, repository: $($allMeta.FullRepository) fromTag: $($actualTagData.FromTag) Tag: $($actualTagData.ActualTag) PSversion: $psversion" -Verbose
     $contextPath = Join-Path -Path $allMeta.imagePath -ChildPath 'docker'
-    $vcf_ref = git rev-parse --short HEAD
     $script:ErrorActionPreference = 'stop'
     Import-Module (Join-Path -Path $testsPath -ChildPath 'containerTestCommon.psm1') -Force
     if ($allMeta.meta.IsLinux) {
@@ -644,7 +643,6 @@ function Get-TestParams
     $buildArgs['fromTag'] = $actualTagData.FromTag
     $buildArgs['PS_VERSION'] = $psversion
     $buildArgs['PACKAGE_VERSION'] = $packageVersion
-    $buildArgs['VCS_REF'] = $vcf_ref
     $buildArgs['IMAGE_NAME'] = $imageNameParam
     $buildArgs['BaseImage'] = $BaseImage
 

From b0e437798788e22763e6d31f5ae6d65ba73227bd Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Fri, 5 Jun 2020 01:10:55 +0800
Subject: [PATCH 070/354] Update ParrotSec commands (#441)

---
 release/community-stable/parrotsec/docker/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index 4ff421ef3..b5d9c2395 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -29,14 +29,14 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Invoke-WebRequest : Authentication failed" issue when executing using
     # docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Parrot-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ParrotSec-latest
 
 # Installation
 RUN \
     # update package list
-    apt-get update \
+    apt update \
     # install dependencies
-    && apt-get install --no-install-recommends -y \
+    && apt install --no-install-recommends -y \
       # required for HttpClientHandler
       libcurl4 \
       # required for help in powershell
@@ -52,11 +52,11 @@ RUN \
     # generate locale
     && locale-gen && update-locale \
     # upgrade distro
-    && apt-get dist-upgrade -y \
+    && parrot-upgrade \
     # Download the Debian9 PowerShell Core package and save it
     && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
     # install powershell package
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
+    && apt install --no-install-recommends -y /tmp/powershell.deb \
     # remove powershell package
     && rm -f /tmp/powershell.deb \
     # Give all user execute permissions and remove write permissions for others
@@ -73,7 +73,7 @@ RUN \
             Start-Sleep -Seconds 6 ; \
           }" \
     # clean downloaded packages
-    && apt-get clean \
+    && apt autoremove \
     # remove package list
     && rm -rf /var/lib/apt/lists/*
 

From 5862aaf3a0f637e261f41773c06c481442e960ce Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 17 Jun 2020 12:15:12 -0700
Subject: [PATCH 071/354] Fix CentOS image size (#448)

---
 release/lts/centos8/meta.json               | 2 +-
 release/lts/centos8/test-deps/meta.json     | 2 +-
 release/preview/centos8/meta.json           | 2 +-
 release/preview/centos8/test-deps/meta.json | 2 +-
 release/stable/centos8/meta.json            | 2 +-
 release/stable/centos8/test-deps/meta.json  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/lts/centos8/meta.json b/release/lts/centos8/meta.json
index 5b7ad3499..c1dece5f7 100644
--- a/release/lts/centos8/meta.json
+++ b/release/lts/centos8/meta.json
@@ -8,6 +8,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 725
     }
 }
diff --git a/release/lts/centos8/test-deps/meta.json b/release/lts/centos8/test-deps/meta.json
index 823ef03c1..ca111f208 100644
--- a/release/lts/centos8/test-deps/meta.json
+++ b/release/lts/centos8/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 750
     }
 }
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
index 74f1fd417..9c68b3e92 100644
--- a/release/preview/centos8/meta.json
+++ b/release/preview/centos8/meta.json
@@ -9,6 +9,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 586
+        "size": 723
     }
 }
diff --git a/release/preview/centos8/test-deps/meta.json b/release/preview/centos8/test-deps/meta.json
index ac3eacfc3..6ceee3efa 100644
--- a/release/preview/centos8/test-deps/meta.json
+++ b/release/preview/centos8/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 606
+        "size": 750
     }
 }
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
index e55b3932d..9d58fabdf 100644
--- a/release/stable/centos8/meta.json
+++ b/release/stable/centos8/meta.json
@@ -9,6 +9,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 723
     }
 }
diff --git a/release/stable/centos8/test-deps/meta.json b/release/stable/centos8/test-deps/meta.json
index 81be65679..55045a0b1 100644
--- a/release/stable/centos8/test-deps/meta.json
+++ b/release/stable/centos8/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 750
     }
 }

From fe658672d2845c92a935c4e7c15975514756667d Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 18 Jun 2020 03:16:23 +0800
Subject: [PATCH 072/354] Update and fixes AmazonLinux gssntlmssp installation
 (#450)

---
 .../amazonlinux/docker/Dockerfile             | 34 +++++++++----------
 .../amazonlinux/getLatestTag.ps1              | 14 --------
 .../community-stable/amazonlinux/meta.json    |  5 ++-
 3 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 release/community-stable/amazonlinux/getLatestTag.ps1

diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 2b09e4e0e..32a0e1c2e 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -5,43 +5,43 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=latest
-ARG imageRepo=amazonlinux
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM amazonlinux:latest AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Define Args and Env needed to create links
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
+ENV \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Define ENVs for Localization/Globalization
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # Set up PowerShell module analysis cache path
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AmazonLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AmazonLinux-latest
 
 # Installation
 RUN \
     # download PowerShell rpm package
     curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
-    # install EPEL repository
-    && yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+    # update package list
+    && yum update -y \
     # install dependencies
     && yum install -y \
-	    # required for help in PowerShell
-	    less \
-	    # install gssntlmssp package from EPEL repository
-	    gssntlmssp \
+    	# required for help in PowerShell
+      less \
+      # install EPEL repository
+      https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+    # update package list from EPEL repository
+    && yum update -y \
+    # install dependencies from EPEL repository
+    && yum install -y \
+      # install gssntlmssp package
+      gssntlmssp \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
     # remove powershell package
diff --git a/release/community-stable/amazonlinux/getLatestTag.ps1 b/release/community-stable/amazonlinux/getLatestTag.ps1
deleted file mode 100644
index 9b8dd9524..000000000
--- a/release/community-stable/amazonlinux/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the amazon linux image on
-
-# The versions of amazon linux we care about
-$shortTags = @('latest')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "amazonlinux" -FullTagFilter '^latest$'
diff --git a/release/community-stable/amazonlinux/meta.json b/release/community-stable/amazonlinux/meta.json
index d97bbe4e1..ad85df91c 100644
--- a/release/community-stable/amazonlinux/meta.json
+++ b/release/community-stable/amazonlinux/meta.json
@@ -2,9 +2,12 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-amazonlinux-#tag#",
-        "amazonlinux-#shorttag#"
+        "amazonlinux"
     ],
     "SubImage": "test-deps"
 }

From 0baca8778e80de0532bc4b9cbfe8950c823fc596 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 18 Jun 2020 04:08:20 +0800
Subject: [PATCH 073/354] Update and fixes OracleLinux gssntlmssp installation
 (#447)

---
 .../oraclelinux/docker/Dockerfile             | 26 +++++++++----------
 .../oraclelinux/getLatestTag.ps1              | 14 ----------
 .../community-stable/oraclelinux/meta.json    |  7 +++--
 3 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 release/community-stable/oraclelinux/getLatestTag.ps1

diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 0846241ea..0fafbf1c5 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -5,42 +5,42 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=latest
-ARG imageRepo=oraclelinux
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM oraclelinux:latest AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
 # Define Args and Env needed to create links
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Define Args and Env needed to create links
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
+ENV \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Define ENVs for Localization/Globalization
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # Set up PowerShell module analysis cache path
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache  \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-latest
 
 # Installation
 RUN \
     # download PowerShell rpm package
     curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
+    # update package list
+    && yum update \
     # install dependencies
     && yum install -y \
-	    # required for help in powershell
+      # required for help in powershell
 	    less \
       # install EPEL repository
 	    oracle-epel-release-el7 \
-      # install gssntlmssp package from EPEL repository
+    # update package list from EPEL repository
+    && yum update \
+    # install dependencies from EPEL repository
+    && yum install -y \
+      # install gssntlmssp package
 	    gssntlmssp \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
diff --git a/release/community-stable/oraclelinux/getLatestTag.ps1 b/release/community-stable/oraclelinux/getLatestTag.ps1
deleted file mode 100644
index 0416f52fa..000000000
--- a/release/community-stable/oraclelinux/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the oracle linux image on
-
-# The versions of oracle linux we care about
-$shortTags = @('latest')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "oraclelinux" -FullTagFilter '^latest$' -OnlyShortTags
diff --git a/release/community-stable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
index a3b6afc86..988a2948b 100644
--- a/release/community-stable/oraclelinux/meta.json
+++ b/release/community-stable/oraclelinux/meta.json
@@ -1,9 +1,12 @@
 {
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
+    "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-oraclelinux-#tag#",
-        "oraclelinux-#shorttag#"
+        "oraclelinux"
     ]
 }

From bdd89c44f1916fc945dc038a651e0ec44f4270ae Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sun, 21 Jun 2020 02:57:56 +0800
Subject: [PATCH 074/354] Update PoshChan config (#445)

---
 .poshchan/settings.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.poshchan/settings.json b/.poshchan/settings.json
index 41abd5b54..f69ae6f1a 100644
--- a/.poshchan/settings.json
+++ b/.poshchan/settings.json
@@ -10,7 +10,8 @@
             "SteveL-MSFT",
             "TravisEz13",
             "anmenaga",
-            "RDIL"
+            "RDIL",
+            "kiazhi"
         ],
     },
     "failures": {
@@ -18,7 +19,8 @@
             "adityapatwardhan",
             "anmenaga",
             "TravisEz13",
-            "RDIL"
+            "RDIL",
+            "kiazhi"
         ]
     },
     "reminders": {

From 743ca5143a42249abdd0bffbef28dddfe252356e Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sun, 21 Jun 2020 02:58:15 +0800
Subject: [PATCH 075/354] Update and fixes Photon terminal keyboard issue
 (#446)

---
 .../community-stable/photon/docker/Dockerfile  | 18 +++++++-----------
 .../community-stable/photon/getLatestTag.ps1   | 14 --------------
 release/community-stable/photon/meta.json      |  7 +++++--
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 release/community-stable/photon/getLatestTag.ps1

diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index a027dab11..e65ec3b8a 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -5,13 +5,10 @@
 # installed from full PowerShell linux tar.gz package
 
 # Define arg(s) needed for the From statement
-ARG fromTag=2.0-20181017
-ARG imageRepo=photon
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM photon:latest AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.0.1
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
@@ -36,13 +33,13 @@ RUN \
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM photon:latest
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
 # Define Args and Env needed to create links
-ARG PS_VERSION=6.1.0
+ARG PS_VERSION=7.0.1
 ARG PS_INSTALL_VERSION=7
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
@@ -57,10 +54,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Invoke-WebRequest : Authentication failed" issue when executing using
     # docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    # Set terminal to linux because there is no xterm library in Photon image
-    # when docker allocate pseudo-tty
-    TERM=linux \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-latest
 
 # Installation
 RUN \
@@ -76,6 +70,8 @@ RUN \
       icu \
       # required for help in powershell
       less \
+      # required for xterm library
+      ncurses-terminfo-6.1-2.ph3.x86_64 \
     # generate locale
     && locale-gen.sh \
     # create the pwsh symbolic link that points to powershell
diff --git a/release/community-stable/photon/getLatestTag.ps1 b/release/community-stable/photon/getLatestTag.ps1
deleted file mode 100644
index 70e80bd17..000000000
--- a/release/community-stable/photon/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the vmware photon image on
-
-# The versions of photon we care about
-$shortTags = @('2.0')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "photon" -FullTagFilter '^2\.0\-\d{8}?$'
diff --git a/release/community-stable/photon/meta.json b/release/community-stable/photon/meta.json
index 7bd510541..a47b1b00b 100644
--- a/release/community-stable/photon/meta.json
+++ b/release/community-stable/photon/meta.json
@@ -1,10 +1,13 @@
 {
     "IsLinux" : true,
-    "SkipWebCmdletTests": true,
+    "SkipWebCmdletTests": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "latest"}
+    ],
     "tagTemplates": [
         "#psversion#-photon-#tag#",
-        "photon-#shorttag#"
+        "photon"
     ]
 }

From 49a66e81ea60db679cc9d3d740b316b77cd1f2ad Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 24 Jun 2020 13:48:21 -0700
Subject: [PATCH 076/354] Remove alpine 3.8 and cleanup 3.11 (#451)

Co-authored-by: Aditya Patwardhan <Aditya Patwardhan>
---
 release/lts/alpine38/dependabot/Dockerfile    |  1 -
 release/lts/alpine38/docker/Dockerfile        | 88 -------------------
 release/lts/alpine38/getLatestTag.ps1         | 14 ---
 release/lts/alpine38/meta.json                | 14 ---
 .../lts/alpine38/test-deps/docker/Dockerfile  | 38 --------
 release/lts/alpine38/test-deps/meta.json      | 16 ----
 release/preview/alpine311/docker/Dockerfile   | 12 +--
 release/preview/alpine311/getLatestTag.ps1    | 14 ---
 release/preview/alpine311/meta.json           |  3 +
 .../preview/alpine38/dependabot/Dockerfile    |  1 -
 release/preview/alpine38/docker/Dockerfile    | 88 -------------------
 release/preview/alpine38/getLatestTag.ps1     | 14 ---
 release/preview/alpine38/meta.json            | 15 ----
 .../alpine38/test-deps/docker/Dockerfile      | 38 --------
 release/preview/alpine38/test-deps/meta.json  | 16 ----
 release/servicing/alpine/docker/Dockerfile    | 84 ------------------
 release/servicing/alpine/getLatestTag.ps1     | 14 ---
 release/servicing/alpine/meta.json            | 14 ---
 18 files changed, 6 insertions(+), 478 deletions(-)
 delete mode 100644 release/lts/alpine38/dependabot/Dockerfile
 delete mode 100644 release/lts/alpine38/docker/Dockerfile
 delete mode 100644 release/lts/alpine38/getLatestTag.ps1
 delete mode 100644 release/lts/alpine38/meta.json
 delete mode 100644 release/lts/alpine38/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/alpine38/test-deps/meta.json
 delete mode 100644 release/preview/alpine311/getLatestTag.ps1
 delete mode 100644 release/preview/alpine38/dependabot/Dockerfile
 delete mode 100644 release/preview/alpine38/docker/Dockerfile
 delete mode 100644 release/preview/alpine38/getLatestTag.ps1
 delete mode 100644 release/preview/alpine38/meta.json
 delete mode 100644 release/preview/alpine38/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/alpine38/test-deps/meta.json
 delete mode 100644 release/servicing/alpine/docker/Dockerfile
 delete mode 100644 release/servicing/alpine/getLatestTag.ps1
 delete mode 100644 release/servicing/alpine/meta.json

diff --git a/release/lts/alpine38/dependabot/Dockerfile b/release/lts/alpine38/dependabot/Dockerfile
deleted file mode 100644
index e942d14d9..000000000
--- a/release/lts/alpine38/dependabot/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM node:14.3.0-alpine
diff --git a/release/lts/alpine38/docker/Dockerfile b/release/lts/alpine38/docker/Dockerfile
deleted file mode 100644
index d2863bb65..000000000
--- a/release/lts/alpine38/docker/Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
-
-# Define arg(s) needed for the From statement
-ARG fromTag=3.8
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-lts
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-lts
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.8
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.0 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-lts symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/getLatestTag.ps1 b/release/lts/alpine38/getLatestTag.ps1
deleted file mode 100644
index bc836c038..000000000
--- a/release/lts/alpine38/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d$' -OnlyShortTags
diff --git a/release/lts/alpine38/meta.json b/release/lts/alpine38/meta.json
deleted file mode 100644
index 0fc85cdd4..000000000
--- a/release/lts/alpine38/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "lts-alpine-#shorttag#"
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 175
-    }
-}
diff --git a/release/lts/alpine38/test-deps/docker/Dockerfile b/release/lts/alpine38/test-deps/docker/Dockerfile
deleted file mode 100644
index 3d41fcfca..000000000
--- a/release/lts/alpine38/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.0.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/alpine38/test-deps/meta.json b/release/lts/alpine38/test-deps/meta.json
deleted file mode 100644
index b4f07326c..000000000
--- a/release/lts/alpine38/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "lts-alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 254
-    }
-}
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index 86880a965..5d7045386 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -3,11 +3,7 @@
 
 # Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
 
-# Define arg(s) needed for the From statement
-ARG fromTag=3.11
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM alpine:3.11 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-preview.1
@@ -28,9 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-ARG fromTag=3.11
+FROM alpine:3.11
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
@@ -45,7 +39,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
 
 # Install dotnet dependencies and ca-certificates
 RUN apk add --no-cache \
diff --git a/release/preview/alpine311/getLatestTag.ps1 b/release/preview/alpine311/getLatestTag.ps1
deleted file mode 100644
index 2f01b125a..000000000
--- a/release/preview/alpine311/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.11')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 3b5562144..3c727ff09 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -7,6 +7,9 @@
         "#psversion#-alpine-#tag#",
         "preview-alpine-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "3.11"}
+    ],
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/preview/alpine38/dependabot/Dockerfile b/release/preview/alpine38/dependabot/Dockerfile
deleted file mode 100644
index e942d14d9..000000000
--- a/release/preview/alpine38/dependabot/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM node:14.3.0-alpine
diff --git a/release/preview/alpine38/docker/Dockerfile b/release/preview/alpine38/docker/Dockerfile
deleted file mode 100644
index 681a92b14..000000000
--- a/release/preview/alpine38/docker/Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
-
-# Define arg(s) needed for the From statement
-ARG fromTag=3.8
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.8
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.0 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine38/getLatestTag.ps1 b/release/preview/alpine38/getLatestTag.ps1
deleted file mode 100644
index bc836c038..000000000
--- a/release/preview/alpine38/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d$' -OnlyShortTags
diff --git a/release/preview/alpine38/meta.json b/release/preview/alpine38/meta.json
deleted file mode 100644
index 8fc3ebb6e..000000000
--- a/release/preview/alpine38/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "#psversion#-alpine-#tag#",
-        "preview-alpine-#shorttag#"
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 212
-    }
-}
diff --git a/release/preview/alpine38/test-deps/docker/Dockerfile b/release/preview/alpine38/test-deps/docker/Dockerfile
deleted file mode 100644
index 83f43feb9..000000000
--- a/release/preview/alpine38/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine38/test-deps/meta.json b/release/preview/alpine38/test-deps/meta.json
deleted file mode 100644
index 8c220b258..000000000
--- a/release/preview/alpine38/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 297
-    }
-}
diff --git a/release/servicing/alpine/docker/Dockerfile b/release/servicing/alpine/docker/Dockerfile
deleted file mode 100644
index 0d27232a3..000000000
--- a/release/servicing/alpine/docker/Dockerfile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
-
-# Define arg(s) needed for the From statement
-ARG fromTag=3.8
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=6
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.0 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/servicing/alpine/getLatestTag.ps1 b/release/servicing/alpine/getLatestTag.ps1
deleted file mode 100644
index 16be03136..000000000
--- a/release/servicing/alpine/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the xenial image on
-
-# The versions of xenial we care about
-$shortTags = @('3.8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.8$' -OnlyShortTags
diff --git a/release/servicing/alpine/meta.json b/release/servicing/alpine/meta.json
deleted file mode 100644
index 927fd7583..000000000
--- a/release/servicing/alpine/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "#psversion#-alpine-#tag#"
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 165
-    }
-}

From 01570efc5946bb6f1e7a2a713337e3ed3bb0d074 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 6 Jul 2020 15:06:07 -0700
Subject: [PATCH 077/354] Update meta.json

---
 release/preview/alpine311/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 3c727ff09..8d5d95ab7 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
+    "osVersion": "Alpine 3.11",
     "tagTemplates": [
         "#psversion#-alpine-#tag#",
         "preview-alpine-#shorttag#"

From acfda164d2bda8de93774ab9e12ea9a243d3a39c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 6 Jul 2020 15:06:37 -0700
Subject: [PATCH 078/354] Update meta.json

---
 release/preview/alpine311/test-deps/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
index fe14f3c82..f2a75ed8c 100644
--- a/release/preview/alpine311/test-deps/meta.json
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
+    "osVersion": "Alpine 3.11",
     "tagTemplates": [
         "#tag#"
     ],

From a247ef9458317cb13c94afb523edc8ee8dcde403 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 7 Jul 2020 14:55:55 -0700
Subject: [PATCH 079/354] Move a couple of problematic images to the new system
 that doesn't query tags (#453)

---
 .dependabot/config.yml                             |  4 ++--
 release/preview/arm32v7/docker/Dockerfile          |  7 ++-----
 release/preview/arm32v7/getLatestTag.ps1           | 14 --------------
 release/preview/arm32v7/meta.json                  |  3 +++
 release/preview/fedora/dependabot/Dockerfile       |  6 ------
 release/preview/fedora/docker/Dockerfile           |  9 +++------
 release/preview/fedora/getLatestTag.ps1            | 14 --------------
 release/preview/fedora/meta.json                   |  5 ++++-
 release/preview/fedora/test-deps/meta.json         |  2 +-
 .../oraclelinux/docker/Dockerfile                  |  0
 .../oraclelinux/meta.json                          |  0
 11 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 release/preview/arm32v7/getLatestTag.ps1
 delete mode 100644 release/preview/fedora/dependabot/Dockerfile
 delete mode 100644 release/preview/fedora/getLatestTag.ps1
 rename release/{community-stable => unstable}/oraclelinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/oraclelinux/meta.json (100%)

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index d59f2d75e..a36172e4c 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -8,7 +8,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/alpine311/dependabot"
+    directory: "/release/preview/alpine311/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"
@@ -24,7 +24,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/fedora/dependabot"
+    directory: "/release/preview/fedora/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
index 229e11ffb..2d6ab658b 100644
--- a/release/preview/arm32v7/docker/Dockerfile
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -1,10 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-ARG fromTag=bionic
-ARG imageRepo=arm32v7/ubuntu
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM arm32v7/ubuntu:bionic AS installer-env
 
 ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -39,7 +36,7 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM ${imageRepo}:${fromTag} AS final-image
+FROM arm32v7/ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/arm32v7/getLatestTag.ps1 b/release/preview/arm32v7/getLatestTag.ps1
deleted file mode 100644
index f4574e134..000000000
--- a/release/preview/arm32v7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/preview/arm32v7/meta.json b/release/preview/arm32v7/meta.json
index 3ba1260ef..dd09585d1 100644
--- a/release/preview/arm32v7/meta.json
+++ b/release/preview/arm32v7/meta.json
@@ -10,6 +10,9 @@
         "#psversion#-arm32v7-ubuntu-#tag#",
         "preview-arm32v7-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 550,
         "Arm32": true
diff --git a/release/preview/fedora/dependabot/Dockerfile b/release/preview/fedora/dependabot/Dockerfile
deleted file mode 100644
index 2b4d6bd3e..000000000
--- a/release/preview/fedora/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM fedora:30
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index 91edc1c55..5915ac4eb 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -1,15 +1,12 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
+# Docker image file that describes Fedora 31 image with PowerShell installed from Microsoft YUM Repo
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM fedora:31 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=28
 
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
@@ -17,7 +14,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-31
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
diff --git a/release/preview/fedora/getLatestTag.ps1 b/release/preview/fedora/getLatestTag.ps1
deleted file mode 100644
index c9ad27d2d..000000000
--- a/release/preview/fedora/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the fedora image on
-
-# The versions of fedora we care about
-$shortTags = @('30')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/preview/fedora/meta.json b/release/preview/fedora/meta.json
index 9e1c98a74..b5de07612 100644
--- a/release/preview/fedora/meta.json
+++ b/release/preview/fedora/meta.json
@@ -2,12 +2,15 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora",
+    "osVersion": "Fedora 31",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-#tag#",
         "preview-fedora-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "31"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
index ae99ee413..728e0f6d6 100644
--- a/release/preview/fedora/test-deps/meta.json
+++ b/release/preview/fedora/test-deps/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora ${fromTag}",
+    "osVersion": "Fedora 31",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#tag#"
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/oraclelinux/docker/Dockerfile
rename to release/unstable/oraclelinux/docker/Dockerfile
diff --git a/release/community-stable/oraclelinux/meta.json b/release/unstable/oraclelinux/meta.json
similarity index 100%
rename from release/community-stable/oraclelinux/meta.json
rename to release/unstable/oraclelinux/meta.json

From 1270b34773f5c4516a37e1673cbd1710191e8cd4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Jul 2020 17:43:49 -0700
Subject: [PATCH 080/354] Fix manifest creation (#459)

---
 createAllManifests.ps1                     |  6 ++----
 createManifest.ps1                         | 11 +++++++++--
 release/lts/debian11/docker/Dockerfile     |  2 +-
 release/preview/debian11/docker/Dockerfile |  2 +-
 release/stable/debian11/docker/Dockerfile  |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index e55d388bf..38f4fce16 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -16,25 +16,23 @@ param (
 $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
 
 $latestStableUbuntu   = "ubuntu-bionic"
-$latestStableWscLtsc  = "windowsservercore-latest"
 $latestStableWsc1809  = "windowsservercore-1809"
 $latestStableWsc1903  = "windowsservercore-1903"
 $latestStableNano1809 = "nanoserver-1809"
 $latestStableNano1903 = "nanoserver-1903"
 
 $latestPreviewUbuntu  = "preview-ubuntu-bionic"
-$latestPreviewWscLtsc = "preview-windowsservercore-latest"
 $latestPreviewWsc1809 = "preview-windowsservercore-1809"
 $latestPreviewWsc1903 = "preview-windowsservercore-1809"
 
 switch ($Channel)
 {
     'preview' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1809 -ManifestTag 'preview'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWsc1809 -ManifestTag 'preview'
     }
 
     'stable' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1809 -ManifestTag 'latest'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWsc1809 -ManifestTag 'latest'
         &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1809 -ManifestTag 'nanoserver'
     }
 }
diff --git a/createManifest.ps1 b/createManifest.ps1
index a065259d0..8732876c9 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -26,14 +26,21 @@ param(
     $TagList = ('ubuntu-16.04', 'windowsservercore')
 )
 
+$first = $true
 $manifestList = @()
 foreach($tag in $TagList)
 {
-    $manifestList += "$ContainerRegistry/${Image}:$tag"
+    $ammend = ""
+    if (!$first) {
+        $amend = '--amend'
+    }
+
+    Write-Verbose -Message "running: docker manifest create $ammend $ContainerRegistry/${Image}:$ManifestTag $ContainerRegistry/${Image}:$tag" -Verbose
+    docker manifest create $amend $ContainerRegistry/${Image}:$ManifestTag "$ContainerRegistry/${Image}:$tag"
+    $first = $false
 }
 
 # Create the manifest
-docker manifest create $ContainerRegistry/${Image}:$ManifestTag $manifestList
 
 # Inspect (print) the manifest
 docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 508a95030..7cf49b6c4 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index f8a4b3162..631f26e8b 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index f2d4733e2..a5299de2a 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -53,7 +53,7 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu63 \
+        libicu67 \
         libssl1.1 \
         libc6 \
         libgcc1 \

From 4e9c09dc930ef95ef742900377a1650388424b6d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 22 Jul 2020 10:45:16 -0700
Subject: [PATCH 081/354] Create rebase.yml

---
 .github/workflows/rebase.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/rebase.yml

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
new file mode 100644
index 000000000..c63426a01
--- /dev/null
+++ b/.github/workflows/rebase.yml
@@ -0,0 +1,18 @@
+on: 
+  issue_comment:
+    types: [created]
+name: Automatic Rebase
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the latest code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Automatic Rebase
+      uses: cirrus-actions/rebase@1.3.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From d78d60fce5e16e7816a307ed3c0e781ed7f7c114 Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Fri, 24 Jul 2020 04:02:14 +1000
Subject: [PATCH 082/354] Ensure coverage of all active Windows releases (#461)

---
 .github/PULL_REQUEST_TEMPLATE.md                |  2 +-
 .../lts/nanoserver1809/dependabot/Dockerfile    |  2 +-
 release/lts/nanoserver1809/meta.json            | 16 +++++++++++++---
 .../lts/windowsservercore/dependabot/Dockerfile |  2 +-
 release/lts/windowsservercore/getLatestTag.ps1  |  2 +-
 .../nanoserver1809/dependabot/Dockerfile        |  2 +-
 release/preview/nanoserver1809/meta.json        | 17 +++++++++++++----
 .../windowsservercore/dependabot/Dockerfile     |  2 +-
 .../preview/windowsservercore/getLatestTag.ps1  | 11 ++++++-----
 release/preview/windowsservercore/meta.json     | 16 +++++++++++++++-
 release/servicing/nanoserver1809/meta.json      | 17 +++++++++++++----
 .../windowsservercore/getLatestTag.ps1          |  2 +-
 release/stable/nanoserver1809/meta.json         | 17 +++++++++++++----
 .../stable/windowsservercore/getLatestTag.ps1   |  2 +-
 14 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b8a91ebac..7b98d0ff8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,5 +14,5 @@
 - **Adds a new image or tag**
   - [ ] Not Applicable
 - **OR**
-  - [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/assets/README.powershellcommunity.md)
+  - [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/docs/README.powershellcommunity.md)
   - [ ] Update [vsts-ci.yml](https://github.com/PowerShell/PowerShell-Docker/blob/master/vsts-ci.yml)
diff --git a/release/lts/nanoserver1809/dependabot/Dockerfile b/release/lts/nanoserver1809/dependabot/Dockerfile
index f5c61be5e..a3434bcb5 100644
--- a/release/lts/nanoserver1809/dependabot/Dockerfile
+++ b/release/lts/nanoserver1809/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/nanoserver:1903
+FROM mcr.microsoft.com/windows/nanoserver:2004
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
index eda76e6a8..939784ba9 100644
--- a/release/lts/nanoserver1809/meta.json
+++ b/release/lts/nanoserver1809/meta.json
@@ -1,10 +1,20 @@
 {
-    "IsLinux" : false,
+    "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"},
-        {"Tag": "1903"}
+        {
+            "Tag": "1809"
+        },
+        {
+            "Tag": "1903"
+        },
+        {
+            "Tag": "1909"
+        },
+        {
+            "Tag": "2004"
+        }
     ],
     "tagTemplates": [
         "lts-nanoserver-#shorttag#"
diff --git a/release/lts/windowsservercore/dependabot/Dockerfile b/release/lts/windowsservercore/dependabot/Dockerfile
index 8521751a2..27d50366b 100644
--- a/release/lts/windowsservercore/dependabot/Dockerfile
+++ b/release/lts/windowsservercore/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/servercore:1903
+FROM mcr.microsoft.com/windows/servercore:2004
diff --git a/release/lts/windowsservercore/getLatestTag.ps1 b/release/lts/windowsservercore/getLatestTag.ps1
index 021417e8c..c67879add 100644
--- a/release/lts/windowsservercore/getLatestTag.ps1
+++ b/release/lts/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1809','1903')
+$shortTags = @('1809', '1903', '1909', '2004')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/preview/nanoserver1809/dependabot/Dockerfile b/release/preview/nanoserver1809/dependabot/Dockerfile
index f5c61be5e..a3434bcb5 100644
--- a/release/preview/nanoserver1809/dependabot/Dockerfile
+++ b/release/preview/nanoserver1809/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/nanoserver:1903
+FROM mcr.microsoft.com/windows/nanoserver:2004
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index a72b8d17a..c9c911e89 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -1,11 +1,20 @@
 {
-    "IsLinux" : false,
+    "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"},
-        {"Tag": "1903"},
-        {"Tag": "1909"}
+        {
+            "Tag": "1809"
+        },
+        {
+            "Tag": "1903"
+        },
+        {
+            "Tag": "1909"
+        },
+        {
+            "Tag": "2004"
+        }
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/preview/windowsservercore/dependabot/Dockerfile b/release/preview/windowsservercore/dependabot/Dockerfile
index 8521751a2..27d50366b 100644
--- a/release/preview/windowsservercore/dependabot/Dockerfile
+++ b/release/preview/windowsservercore/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/servercore:1903
+FROM mcr.microsoft.com/windows/servercore:2004
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
index b481c4ef5..5ece47358 100644
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ b/release/preview/windowsservercore/getLatestTag.ps1
@@ -3,17 +3,18 @@
 
 # return objects representing the tags we need to base the nanoserver image on
 
+
 param(
     [Switch]
-    $CI
+    $CI,
+    # The versions of nanoserver we care about
+    [string[]]
+    $ShortTags
 )
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath -Force
-
-# The versions of nanoserver we care about
-$shortTags = @('1809','1903','1909')
+Import-Module $modulePath
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/preview/windowsservercore/meta.json b/release/preview/windowsservercore/meta.json
index 67638737e..8a48a0afc 100644
--- a/release/preview/windowsservercore/meta.json
+++ b/release/preview/windowsservercore/meta.json
@@ -2,11 +2,25 @@
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Windows Server Core, version ${fromTag}",
+    "shortTags": [
+        {
+            "Tag": "1809"
+        },
+        {
+            "Tag": "1903"
+        },
+        {
+            "Tag": "1909"
+        },
+        {
+            "Tag": "2004"
+        }
+    ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#tag#",
         "preview-windowsservercore-#shorttag#"
-    ]    ,
+    ],
     "TestProperties": {
         "size": 1
     }
diff --git a/release/servicing/nanoserver1809/meta.json b/release/servicing/nanoserver1809/meta.json
index b5684d595..57494217f 100644
--- a/release/servicing/nanoserver1809/meta.json
+++ b/release/servicing/nanoserver1809/meta.json
@@ -1,11 +1,20 @@
 {
-    "IsLinux" : false,
+    "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"},
-        {"Tag": "1903"},
-        {"Tag": "1909"}
+        {
+            "Tag": "1809"
+        },
+        {
+            "Tag": "1903"
+        },
+        {
+            "Tag": "1909"
+        },
+        {
+            "Tag": "2004"
+        }
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#"
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
index b481c4ef5..c67879add 100644
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ b/release/servicing/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1809','1903','1909')
+$shortTags = @('1809', '1903', '1909', '2004')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index 0dd88ece6..f5d25ef47 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -1,11 +1,20 @@
 {
-    "IsLinux" : false,
+    "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"},
-        {"Tag": "1903"},
-        {"Tag": "1909"}
+        {
+            "Tag": "1809"
+        },
+        {
+            "Tag": "1903"
+        },
+        {
+            "Tag": "1909"
+        },
+        {
+            "Tag": "2004"
+        }
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
index b481c4ef5..c67879add 100644
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ b/release/stable/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1809','1903','1909')
+$shortTags = @('1809', '1903', '1909', '2004')
 
 Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

From 7ceb5f5e50fdcef5ae75d384a9b64d38d6a84df4 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Mon, 27 Jul 2020 02:16:44 +0800
Subject: [PATCH 083/354] Add OpenSSH client package to linux community-stable
 images (#465)

---
 release/community-stable/amazonlinux/docker/Dockerfile |  8 +++++---
 release/community-stable/archlinux/docker/Dockerfile   |  8 +++++---
 release/community-stable/blackarch/docker/Dockerfile   |  8 +++++---
 release/community-stable/clearlinux/docker/Dockerfile  |  3 +++
 release/community-stable/kalilinux/docker/Dockerfile   |  8 +++++---
 release/community-stable/parrotsec/docker/Dockerfile   | 10 ++++++----
 release/community-stable/photon/docker/Dockerfile      |  2 ++
 release/unstable/oraclelinux/docker/Dockerfile         |  8 +++++---
 8 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 32a0e1c2e..13f5cffe6 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -26,14 +26,14 @@ ENV \
 
 # Installation
 RUN \
-    # download PowerShell rpm package
-    curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # update package list
-    && yum update -y \
+    yum update -y \
     # install dependencies
     && yum install -y \
     	# required for help in PowerShell
       less \
+      # required for SSH
+      openssh-clients \
       # install EPEL repository
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     # update package list from EPEL repository
@@ -42,6 +42,8 @@ RUN \
     && yum install -y \
       # install gssntlmssp package
       gssntlmssp \
+    # download the powershell package
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
     # remove powershell package
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index 56ce053cc..2abf966f3 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -42,7 +42,7 @@ RUN \
 FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
-COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"]
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
@@ -80,11 +80,13 @@ RUN \
       core/icu \
       # required for SSL
       openssl-1.0 \
+      # required for SSH
+      openssh \
     # install gss-ntlmssp package from the previous stage
-    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
+    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
-    # Pull down the powershell linux tar file
+    # download the powershell linux compressed package
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \
     # uncompress powershell linux tar file
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} -v \
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 8bf42d49d..1887cb64b 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -43,7 +43,7 @@ RUN \
 FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
-COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"]
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"]
 
 # Define Args for the needed for BlackArch Linux
 ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh
@@ -95,11 +95,13 @@ RUN \
       core/icu \
       # required for SSL
       openssl-1.0 \
+      # required for SSH
+      openssh \
     # install gss-ntlmssp package from the previous stage
-    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \
+    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
-    # Pull down the powershell linux tar file
+    # download the powershell linux compressed package
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \
     # uncompress powershell linux tar file
     && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} \
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
index aeeaba615..9c11daf7a 100644
--- a/release/community-stable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -32,7 +32,10 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 RUN \
     # install dependencies
     swupd bundle-add \
+      # required for help in PowerShell
       less \
+      # required for SSH
+      openssh-client \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # uncompress powershell linux tar file
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index ee6bfd250..c2ec22a26 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN \
     # install dependencies
     && apt-get install --no-install-recommends -y \
       # required for HttpClientHandler
-      libcurl4 \
+      curl \
       # required for SSL
       ca-certificates \
       # required for help in powershell
@@ -44,14 +44,16 @@ RUN \
       locales \
       # required to support NTLM for PSRemoting
       gss-ntlmssp \
-      wget \
+      # required for International Components for Unicode
       libicu63 \
+      # required for SSH
+      openssh-client \
     # enable en_US.UTF-8 locale
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
     && locale-gen && update-locale \
     # download the powershell package
-    && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
     # install powershell package
     && apt-get install --no-install-recommends -y /tmp/powershell.deb \
     # remove powershell package
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index b5d9c2395..d067e1453 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -38,23 +38,25 @@ RUN \
     # install dependencies
     && apt install --no-install-recommends -y \
       # required for HttpClientHandler
-      libcurl4 \
+      curl \
       # required for help in powershell
       less \
       # required to setup the locale
       locales \
       # required to support NTLM for PSRemoting
       gss-ntlmssp \
-      wget \
+      # required for International Components for Unicode
       libicu63 \
+      # required for SSH
+      openssh-client \
     # enable en_US.UTF-8 locale
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     # generate locale
     && locale-gen && update-locale \
     # upgrade distro
     && parrot-upgrade \
-    # Download the Debian9 PowerShell Core package and save it
-    && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \
+    # download the powershell package
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
     # install powershell package
     && apt install --no-install-recommends -y /tmp/powershell.deb \
     # remove powershell package
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index e65ec3b8a..2241f33bc 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -72,6 +72,8 @@ RUN \
       less \
       # required for xterm library
       ncurses-terminfo-6.1-2.ph3.x86_64 \
+      # required for SSH
+      openssh-clients \
     # generate locale
     && locale-gen.sh \
     # create the pwsh symbolic link that points to powershell
diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
index 0fafbf1c5..ed9cd84cd 100644
--- a/release/unstable/oraclelinux/docker/Dockerfile
+++ b/release/unstable/oraclelinux/docker/Dockerfile
@@ -26,14 +26,14 @@ ENV \
 
 # Installation
 RUN \
-    # download PowerShell rpm package
-    curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # update package list
-    && yum update \
+    yum update -y \
     # install dependencies
     && yum install -y \
       # required for help in powershell
 	    less \
+      # required for SSH
+      openssh-clients \
       # install EPEL repository
 	    oracle-epel-release-el7 \
     # update package list from EPEL repository
@@ -42,6 +42,8 @@ RUN \
     && yum install -y \
       # install gssntlmssp package
 	    gssntlmssp \
+    # download the powershell package
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
     # install powershell package
     && yum install -y /tmp/powershell-linux.rpm \
     # remove powershell package

From af86455157304a88ec0cb5256d5ceedee245d9e6 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Mon, 27 Jul 2020 02:18:08 +0800
Subject: [PATCH 084/354] Add OpenSSH client package to linux preview images
 except Arm32v7 (#466)

---
 release/preview/alpine311/docker/Dockerfile   | 3 +++
 release/preview/alpine311/meta.json           | 2 +-
 release/preview/alpine39/docker/Dockerfile    | 3 +++
 release/preview/centos7/docker/Dockerfile     | 2 ++
 release/preview/centos8/docker/Dockerfile     | 2 ++
 release/preview/debian10/docker/Dockerfile    | 2 ++
 release/preview/debian11/docker/Dockerfile    | 2 ++
 release/preview/debian9/docker/Dockerfile     | 2 ++
 release/preview/fedora/docker/Dockerfile      | 2 ++
 release/preview/ubuntu16.04/docker/Dockerfile | 2 ++
 release/preview/ubuntu18.04/docker/Dockerfile | 2 ++
 release/preview/ubuntu20.04/docker/Dockerfile | 2 ++
 12 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index 5d7045386..366aa81a7 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -62,6 +62,9 @@ RUN apk add --no-cache \
     && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
     lttng-ust \
     \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 8d5d95ab7..998fb3b9e 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -13,6 +13,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 210
+        "size": 211
     }
 }
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 827bfc462..2a6077e49 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -68,6 +68,9 @@ RUN apk add --no-cache \
     && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
     lttng-ust \
     \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index b6004302e..e9d5e1ee9 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -32,6 +32,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index fbb4b358d..26008d7ee 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       less \
       # clear is part of ncurses which is used by clear
       ncurses \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     # remove powershell package
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 20f860b50..b01d0c47c 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index 631f26e8b..348b6faa6 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index a5c3553ac..67f627498 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index 5915ac4eb..573bd1e47 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -31,6 +31,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       compat-openssl10 \
       ca-certificates \
       gssntlmssp \
+    # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && echo "end - misc packages" \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     && echo "starting FEDORA-2019-27e7b92407" \
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 727a54d57..e45b881d2 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 9f3db9364..509f832d4 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index f139fa96b..3af27e43b 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -60,6 +60,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && apt-get dist-upgrade -y \
     && apt-get clean \

From 190a95362ae0d936116133bc3ea247f253a77dba Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sun, 26 Jul 2020 14:19:25 -0400
Subject: [PATCH 085/354] Update dependabot config to v2 (#467)

---
 .dependabot/config.yml | 44 ----------------------------------
 .github/dependabot.yml | 54 ++++++++++++++++++++++++++++++++++++++++++
 .vsts-ci/phase.yml     | 31 ------------------------
 3 files changed, 54 insertions(+), 75 deletions(-)
 delete mode 100644 .dependabot/config.yml
 create mode 100644 .github/dependabot.yml

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
deleted file mode 100644
index a36172e4c..000000000
--- a/.dependabot/config.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: 1
-
-# update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex
-
-update_configs:
-  - package_manager: "docker"
-    directory: "/release/preview/alpine39/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/alpine311/docker"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/centos8/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/debian10/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/debian11/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/fedora/docker"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/nanoserver1809/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/ubuntu20.04/docker"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/windowsservercore/dependabot"
-    update_schedule: "weekly"
-
-  - package_manager: "docker"
-    directory: "/release/preview/alpine38/dependabot"
-    update_schedule: "weekly"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..0c02e9b7d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,54 @@
+version: 2
+
+# update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex
+
+updates:
+  - package-ecosystem: "docker"
+    directory: "/release/preview/alpine39/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/alpine311/docker"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/centos8/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/debian10/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/debian11/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/fedora/docker"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/nanoserver1809/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/ubuntu20.04/docker"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/windowsservercore/dependabot"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/preview/alpine38/dependabot"
+    schedule:
+      interval: "weekly"
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index b4f526471..b289fc423 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -42,26 +42,6 @@ jobs:
     displayName: Install Pester
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.8'
-    displayName: Setup Python engine
-    condition: succeeded()
-
-  - bash: |
-      git clone https://github.com/RDIL/dockerlint.git
-      cd dockerlint
-      git checkout 0.2.1
-      make install-deps
-      make
-      cd ..
-    displayName: Download dockerlint
-    condition: succeeded()
-
-  - bash: python dockerlint/main.py -d release/${CHANNEL}/${IMAGENAME}/docker/Dockerfile -R
-    displayName: Run dockerlint
-    condition: succeeded()
-
   - pwsh: |
       $extraParams = @{}
       if($env:ACR_NAME)
@@ -95,14 +75,3 @@ jobs:
       testResultsFiles: '**\test*.xml'
       testRunTitle: $(ImageName)
       mergeTestResults: true
-
-  - task: PublishTestResults@2
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-    displayName: Publish $(ImageName) dockerlint Results
-    continueOnError: ${{ variables.continueonerror }}
-
-    inputs:
-      testRunner: JUnit
-      testResultsFiles: 'dockerlint.test_RESULTS.xml'
-      testRunTitle: $(ImageName) dockerlint
-      mergeTestResults: true

From 4a04fbed4c588e7f7d58c518803e8667ae98860f Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Tue, 28 Jul 2020 07:50:10 +0800
Subject: [PATCH 086/354] Add OpenSSH client package to linux stable images
 except Arm32v7 (#469)

---
 release/stable/alpine38/docker/Dockerfile    | 3 +++
 release/stable/alpine39/docker/Dockerfile    | 3 +++
 release/stable/centos7/docker/Dockerfile     | 2 ++
 release/stable/centos8/docker/Dockerfile     | 2 ++
 release/stable/debian10/docker/Dockerfile    | 2 ++
 release/stable/debian11/docker/Dockerfile    | 2 ++
 release/stable/debian9/docker/Dockerfile     | 2 ++
 release/stable/fedora/docker/Dockerfile      | 2 ++
 release/stable/ubuntu16.04/docker/Dockerfile | 2 ++
 release/stable/ubuntu18.04/docker/Dockerfile | 2 ++
 10 files changed, 22 insertions(+)

diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
index c1e2b281c..c90555043 100644
--- a/release/stable/alpine38/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -66,6 +66,9 @@ RUN apk add --no-cache \
     && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
     lttng-ust \
     \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index ef731b17c..1aa79b105 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -68,6 +68,9 @@ RUN apk add --no-cache \
     && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
     lttng-ust \
     \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index a68dc88f8..d77c97cb7 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index b4dec513f..e00308762 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       less \
       # clear is part of ncurses which is used by clear
       ncurses \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     # remove powershell package
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index 0b518bd55..b4f664ef8 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index a5299de2a..c7cac3319 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 56f4fdc75..644a231ac 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -27,6 +27,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
index c3242375b..e82132b5d 100644
--- a/release/stable/fedora/docker/Dockerfile
+++ b/release/stable/fedora/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       compat-openssl10 \
       ca-certificates \
       gssntlmssp \
+    # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && echo "end - misc packages" \
     && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
     && echo "starting FEDORA-2019-27e7b92407" \
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index 5a9eaed93..fc8ca0ae7 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 405875817..21c987e28 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \

From ced4c83987f9ac30388df8d93dafa3d7f1ed0407 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Tue, 28 Jul 2020 07:50:43 +0800
Subject: [PATCH 087/354] Add OpenSSH client package to linux servicing images
 (#470)

---
 release/servicing/centos7/docker/Dockerfile     | 2 ++
 release/servicing/debian9/docker/Dockerfile     | 2 ++
 release/servicing/opensuse423/docker/Dockerfile | 2 ++
 release/servicing/ubuntu16.04/docker/Dockerfile | 2 ++
 release/servicing/ubuntu18.04/docker/Dockerfile | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index a68dc88f8..d77c97cb7 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index 29954e8d9..f6653e269 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -27,6 +27,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index 55d851800..4c848c848 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -60,6 +60,8 @@ RUN zypper --non-interactive update --skip-interactive \
         libicu \
         openssl \
         less \
+        # PowerShell remoting over SSH dependencies
+        openssh-clients \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index ada151996..94072afab 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -27,6 +27,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index 2f48a4b50..184c5aec6 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -27,6 +27,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \

From 52ac213081689fea864786b8bfbce6295d72d69a Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 30 Jul 2020 03:21:21 +0800
Subject: [PATCH 088/354] Add OpenSSH client package to linux lts images except
 Arm32v7 (#471)

---
 release/lts/alpine39/docker/Dockerfile    | 3 +++
 release/lts/centos7/docker/Dockerfile     | 2 ++
 release/lts/centos8/docker/Dockerfile     | 2 ++
 release/lts/debian10/docker/Dockerfile    | 2 ++
 release/lts/debian11/docker/Dockerfile    | 2 ++
 release/lts/debian9/docker/Dockerfile     | 2 ++
 release/lts/fedora/docker/Dockerfile      | 2 ++
 release/lts/ubuntu16.04/docker/Dockerfile | 2 ++
 release/lts/ubuntu18.04/docker/Dockerfile | 2 ++
 9 files changed, 19 insertions(+)

diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
index 406350acf..8ad9170e6 100644
--- a/release/lts/alpine39/docker/Dockerfile
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -68,6 +68,9 @@ RUN apk add --no-cache \
     && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
     lttng-ust \
     \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index cd668d6ea..5f9640a3e 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -32,6 +32,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index bf733cce1..97ebb96dd 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       less \
       # clear is part of ncurses which is used by clear
       ncurses \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
     # remove powershell package
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index abb24b745..b65580ee3 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 7cf49b6c4..b87075584 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -61,6 +61,8 @@ RUN apt-get update \
         liblttng-ust0 \
         libstdc++6 \
         zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     && apt-get dist-upgrade -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index a1f2bf4ae..6aef923fd 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
index db5eb26a1..02d6298db 100644
--- a/release/lts/fedora/docker/Dockerfile
+++ b/release/lts/fedora/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       compat-openssl10 \
       ca-certificates \
       gssntlmssp \
+    # PowerShell remoting over SSH dependencies
+      openssh-clients \
     && echo "end - misc packages" \
     && echo "starting FEDORA-2019-27e7b92407" \
     # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 69a8dd15a..7a48b58df 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 65d0b739e..118100ff5 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -28,6 +28,8 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
     # Download the Linux package and save it
     && echo ${PS_PACKAGE_URL} \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \

From 04fab40a3c5aa43bba665ba2bed1007abc7c689b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 5 Aug 2020 11:44:07 -0700
Subject: [PATCH 089/354] Fix typo in variable initialization (#468)

---
 createManifest.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/createManifest.ps1 b/createManifest.ps1
index 8732876c9..09ec59a54 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -30,7 +30,7 @@ $first = $true
 $manifestList = @()
 foreach($tag in $TagList)
 {
-    $ammend = ""
+    $amend = ""
     if (!$first) {
         $amend = '--amend'
     }

From 5154d4cd9cc4fac2276216316353f3d1be648b29 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 13 Aug 2020 19:03:24 +0100
Subject: [PATCH 090/354] Remove All rights reserved term in copyright header
 (#480)

---
 build.ps1                                                       | 2 +-
 createAllManifests.ps1                                          | 2 +-
 createManifest.ps1                                              | 2 +-
 docs/development.md                                             | 2 +-
 release/community-stable/amazonlinux/docker/Dockerfile          | 2 +-
 .../community-stable/amazonlinux/test-deps/docker/Dockerfile    | 2 +-
 release/community-stable/archlinux/docker/Dockerfile            | 2 +-
 release/community-stable/blackarch/docker/Dockerfile            | 2 +-
 release/community-stable/clearlinux/docker/Dockerfile           | 2 +-
 release/community-stable/kalilinux/docker/Dockerfile            | 2 +-
 release/community-stable/parrotsec/docker/Dockerfile            | 2 +-
 release/community-stable/photon/docker/Dockerfile               | 2 +-
 release/lts/alpine39/dependabot/Dockerfile                      | 2 +-
 release/lts/alpine39/docker/Dockerfile                          | 2 +-
 release/lts/alpine39/getLatestTag.ps1                           | 2 +-
 release/lts/arm32v7/docker/Dockerfile                           | 2 +-
 release/lts/arm32v7/getLatestTag.ps1                            | 2 +-
 release/lts/centos7/getLatestTag.ps1                            | 2 +-
 release/lts/centos8/dependabot/Dockerfile                       | 2 +-
 release/lts/centos8/getLatestTag.ps1                            | 2 +-
 release/lts/debian10/dependabot/Dockerfile                      | 2 +-
 release/lts/debian10/getLatestTag.ps1                           | 2 +-
 release/lts/debian11/dependabot/Dockerfile                      | 2 +-
 release/lts/debian11/getLatestTag.ps1                           | 2 +-
 release/lts/debian9/getLatestTag.ps1                            | 2 +-
 release/lts/fedora/dependabot/Dockerfile                        | 2 +-
 release/lts/fedora/getLatestTag.ps1                             | 2 +-
 release/lts/nanoserver1809/dependabot/Dockerfile                | 2 +-
 release/lts/nanoserver1809/getLatestTag.ps1                     | 2 +-
 release/lts/ubuntu16.04/getLatestTag.ps1                        | 2 +-
 release/lts/ubuntu18.04/dependabot/Dockerfile                   | 2 +-
 release/lts/ubuntu18.04/getLatestTag.ps1                        | 2 +-
 release/lts/windowsservercore/dependabot/Dockerfile             | 2 +-
 release/lts/windowsservercore/getLatestTag.ps1                  | 2 +-
 release/preview/alpine311/dependabot/Dockerfile                 | 2 +-
 release/preview/alpine311/docker/Dockerfile                     | 2 +-
 release/preview/alpine39/dependabot/Dockerfile                  | 2 +-
 release/preview/alpine39/docker/Dockerfile                      | 2 +-
 release/preview/alpine39/getLatestTag.ps1                       | 2 +-
 release/preview/arm32v7/docker/Dockerfile                       | 2 +-
 release/preview/centos7/getLatestTag.ps1                        | 2 +-
 release/preview/centos8/dependabot/Dockerfile                   | 2 +-
 release/preview/centos8/getLatestTag.ps1                        | 2 +-
 release/preview/debian10/dependabot/Dockerfile                  | 2 +-
 release/preview/debian10/getLatestTag.ps1                       | 2 +-
 release/preview/debian11/dependabot/Dockerfile                  | 2 +-
 release/preview/debian11/getLatestTag.ps1                       | 2 +-
 release/preview/debian9/getLatestTag.ps1                        | 2 +-
 release/preview/nanoserver1809/dependabot/Dockerfile            | 2 +-
 release/preview/nanoserver1809/getLatestTag.ps1                 | 2 +-
 release/preview/ubuntu16.04/getLatestTag.ps1                    | 2 +-
 release/preview/ubuntu18.04/getLatestTag.ps1                    | 2 +-
 release/preview/windowsservercore/dependabot/Dockerfile         | 2 +-
 release/preview/windowsservercore/getLatestTag.ps1              | 2 +-
 release/servicing/centos7/getLatestTag.ps1                      | 2 +-
 release/servicing/debian9/getLatestTag.ps1                      | 2 +-
 release/servicing/nanoserver1809/getLatestTag.ps1               | 2 +-
 release/servicing/opensuse423/getLatestTag.ps1                  | 2 +-
 release/servicing/ubuntu16.04/getLatestTag.ps1                  | 2 +-
 release/servicing/ubuntu18.04/getLatestTag.ps1                  | 2 +-
 release/servicing/windowsservercore/getLatestTag.ps1            | 2 +-
 release/stable/alpine38/docker/Dockerfile                       | 2 +-
 release/stable/alpine38/getLatestTag.ps1                        | 2 +-
 release/stable/alpine39/dependabot/Dockerfile                   | 2 +-
 release/stable/alpine39/docker/Dockerfile                       | 2 +-
 release/stable/alpine39/getLatestTag.ps1                        | 2 +-
 release/stable/arm32v7/docker/Dockerfile                        | 2 +-
 release/stable/arm32v7/getLatestTag.ps1                         | 2 +-
 release/stable/centos7/getLatestTag.ps1                         | 2 +-
 release/stable/centos8/dependabot/Dockerfile                    | 2 +-
 release/stable/centos8/getLatestTag.ps1                         | 2 +-
 release/stable/debian10/dependabot/Dockerfile                   | 2 +-
 release/stable/debian10/getLatestTag.ps1                        | 2 +-
 release/stable/debian11/dependabot/Dockerfile                   | 2 +-
 release/stable/debian11/getLatestTag.ps1                        | 2 +-
 release/stable/debian9/getLatestTag.ps1                         | 2 +-
 release/stable/fedora/dependabot/Dockerfile                     | 2 +-
 release/stable/fedora/getLatestTag.ps1                          | 2 +-
 release/stable/nanoserver1809/getLatestTag.ps1                  | 2 +-
 release/stable/ubuntu16.04/getLatestTag.ps1                     | 2 +-
 release/stable/ubuntu18.04/getLatestTag.ps1                     | 2 +-
 release/stable/windowsservercore/getLatestTag.ps1               | 2 +-
 release/unstable/oraclelinux/docker/Dockerfile                  | 2 +-
 republish.ps1                                                   | 2 +-
 tests/container.tests.ps1                                       | 2 +-
 tests/containerTestCommon.psm1                                  | 2 +-
 tools/getDockerTags/getDockerTags.psm1                          | 2 +-
 87 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 4b48db118..54e0c670f 100755
--- a/build.ps1
+++ b/build.ps1
@@ -1,5 +1,5 @@
 #!/usr/bin/pwsh
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Queue Docker image build for a particular image
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index 38f4fce16..ae02fde64 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # script to create the Docker manifest lists
diff --git a/createManifest.ps1 b/createManifest.ps1
index 09ec59a54..e250e1429 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Used to create a container manifest.
diff --git a/docs/development.md b/docs/development.md
index 90aacad5a..f7c19d59a 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -78,7 +78,7 @@ All `Dockerfile`s should follow certain standards:
    For example:
 
 ```dockerfile
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes a brief description of the image to describe
diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 13f5cffe6..7b1a9ca9f 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Amazon Linux image with PowerShell
diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
index ce69ec819..308a09080 100644
--- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Amazon Linux image with PowerShell
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
index 2abf966f3..b08eaed4f 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Arch Linux image with PowerShell
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
index 1887cb64b..464facc25 100644
--- a/release/community-stable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an BlackArch Linux image (derived from Arch
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile
index 9c11daf7a..5a28c7283 100644
--- a/release/community-stable/clearlinux/docker/Dockerfile
+++ b/release/community-stable/clearlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Intel Clear Linux image with PowerShell
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index c2ec22a26..5eecdd116 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Kali Rolling image with PowerShell
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index d067e1453..cd309a9d5 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Parrot image with PowerShell
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index 2241f33bc..48d33f5ff 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an VMware Photon image with PowerShell
diff --git a/release/lts/alpine39/dependabot/Dockerfile b/release/lts/alpine39/dependabot/Dockerfile
index cf026e7c3..cf983a1b7 100644
--- a/release/lts/alpine39/dependabot/Dockerfile
+++ b/release/lts/alpine39/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
index 8ad9170e6..911963ae6 100644
--- a/release/lts/alpine39/docker/Dockerfile
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
diff --git a/release/lts/alpine39/getLatestTag.ps1 b/release/lts/alpine39/getLatestTag.ps1
index bab6f5f80..e3832bb04 100644
--- a/release/lts/alpine39/getLatestTag.ps1
+++ b/release/lts/alpine39/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the Alpine image on
diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
index bc792dd67..f798e2164 100644
--- a/release/lts/arm32v7/docker/Dockerfile
+++ b/release/lts/arm32v7/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 ARG fromTag=bionic
diff --git a/release/lts/arm32v7/getLatestTag.ps1 b/release/lts/arm32v7/getLatestTag.ps1
index f4574e134..211008454 100644
--- a/release/lts/arm32v7/getLatestTag.ps1
+++ b/release/lts/arm32v7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/lts/centos7/getLatestTag.ps1 b/release/lts/centos7/getLatestTag.ps1
index daaac1cc9..2d9d1ce17 100644
--- a/release/lts/centos7/getLatestTag.ps1
+++ b/release/lts/centos7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/lts/centos8/dependabot/Dockerfile b/release/lts/centos8/dependabot/Dockerfile
index 5bd787a7a..635aa6180 100644
--- a/release/lts/centos8/dependabot/Dockerfile
+++ b/release/lts/centos8/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/centos8/getLatestTag.ps1 b/release/lts/centos8/getLatestTag.ps1
index 9f6c243eb..7de27c1c3 100644
--- a/release/lts/centos8/getLatestTag.ps1
+++ b/release/lts/centos8/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/lts/debian10/dependabot/Dockerfile b/release/lts/debian10/dependabot/Dockerfile
index 934a2d9c0..505b9d83e 100644
--- a/release/lts/debian10/dependabot/Dockerfile
+++ b/release/lts/debian10/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/debian10/getLatestTag.ps1 b/release/lts/debian10/getLatestTag.ps1
index f262fed60..eeab402e1 100644
--- a/release/lts/debian10/getLatestTag.ps1
+++ b/release/lts/debian10/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/lts/debian11/dependabot/Dockerfile b/release/lts/debian11/dependabot/Dockerfile
index 8a60bc3b0..6e90fb911 100644
--- a/release/lts/debian11/dependabot/Dockerfile
+++ b/release/lts/debian11/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/debian11/getLatestTag.ps1 b/release/lts/debian11/getLatestTag.ps1
index f19797bb9..187b7cf13 100644
--- a/release/lts/debian11/getLatestTag.ps1
+++ b/release/lts/debian11/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/lts/debian9/getLatestTag.ps1 b/release/lts/debian9/getLatestTag.ps1
index 4ceee128f..22da10773 100644
--- a/release/lts/debian9/getLatestTag.ps1
+++ b/release/lts/debian9/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/lts/fedora/dependabot/Dockerfile b/release/lts/fedora/dependabot/Dockerfile
index 2b4d6bd3e..78061c9c0 100644
--- a/release/lts/fedora/dependabot/Dockerfile
+++ b/release/lts/fedora/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/fedora/getLatestTag.ps1 b/release/lts/fedora/getLatestTag.ps1
index c9ad27d2d..11d8fada4 100644
--- a/release/lts/fedora/getLatestTag.ps1
+++ b/release/lts/fedora/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the fedora image on
diff --git a/release/lts/nanoserver1809/dependabot/Dockerfile b/release/lts/nanoserver1809/dependabot/Dockerfile
index a3434bcb5..863e481c7 100644
--- a/release/lts/nanoserver1809/dependabot/Dockerfile
+++ b/release/lts/nanoserver1809/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/nanoserver1809/getLatestTag.ps1 b/release/lts/nanoserver1809/getLatestTag.ps1
index 2c7ce394f..b50d5ad3e 100644
--- a/release/lts/nanoserver1809/getLatestTag.ps1
+++ b/release/lts/nanoserver1809/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/lts/ubuntu16.04/getLatestTag.ps1 b/release/lts/ubuntu16.04/getLatestTag.ps1
index 6ef600d39..ed6a85150 100644
--- a/release/lts/ubuntu16.04/getLatestTag.ps1
+++ b/release/lts/ubuntu16.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the xenial image on
diff --git a/release/lts/ubuntu18.04/dependabot/Dockerfile b/release/lts/ubuntu18.04/dependabot/Dockerfile
index 2f686eca8..89783e07d 100644
--- a/release/lts/ubuntu18.04/dependabot/Dockerfile
+++ b/release/lts/ubuntu18.04/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/ubuntu18.04/getLatestTag.ps1 b/release/lts/ubuntu18.04/getLatestTag.ps1
index 40aa9aaf9..162b83cde 100644
--- a/release/lts/ubuntu18.04/getLatestTag.ps1
+++ b/release/lts/ubuntu18.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the beaver image on
diff --git a/release/lts/windowsservercore/dependabot/Dockerfile b/release/lts/windowsservercore/dependabot/Dockerfile
index 27d50366b..de415a7f7 100644
--- a/release/lts/windowsservercore/dependabot/Dockerfile
+++ b/release/lts/windowsservercore/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/lts/windowsservercore/getLatestTag.ps1 b/release/lts/windowsservercore/getLatestTag.ps1
index c67879add..4b74754eb 100644
--- a/release/lts/windowsservercore/getLatestTag.ps1
+++ b/release/lts/windowsservercore/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/preview/alpine311/dependabot/Dockerfile b/release/preview/alpine311/dependabot/Dockerfile
index 79af9cda6..b39d2c5c7 100644
--- a/release/preview/alpine311/dependabot/Dockerfile
+++ b/release/preview/alpine311/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index 366aa81a7..7103571bf 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
diff --git a/release/preview/alpine39/dependabot/Dockerfile b/release/preview/alpine39/dependabot/Dockerfile
index cf026e7c3..cf983a1b7 100644
--- a/release/preview/alpine39/dependabot/Dockerfile
+++ b/release/preview/alpine39/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 2a6077e49..7e19e97f1 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
diff --git a/release/preview/alpine39/getLatestTag.ps1 b/release/preview/alpine39/getLatestTag.ps1
index bab6f5f80..e3832bb04 100644
--- a/release/preview/alpine39/getLatestTag.ps1
+++ b/release/preview/alpine39/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the Alpine image on
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
index 2d6ab658b..57274d618 100644
--- a/release/preview/arm32v7/docker/Dockerfile
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 FROM arm32v7/ubuntu:bionic AS installer-env
diff --git a/release/preview/centos7/getLatestTag.ps1 b/release/preview/centos7/getLatestTag.ps1
index daaac1cc9..2d9d1ce17 100644
--- a/release/preview/centos7/getLatestTag.ps1
+++ b/release/preview/centos7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/preview/centos8/dependabot/Dockerfile b/release/preview/centos8/dependabot/Dockerfile
index 5bd787a7a..635aa6180 100644
--- a/release/preview/centos8/dependabot/Dockerfile
+++ b/release/preview/centos8/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/centos8/getLatestTag.ps1 b/release/preview/centos8/getLatestTag.ps1
index 9f6c243eb..7de27c1c3 100644
--- a/release/preview/centos8/getLatestTag.ps1
+++ b/release/preview/centos8/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/preview/debian10/dependabot/Dockerfile b/release/preview/debian10/dependabot/Dockerfile
index 934a2d9c0..505b9d83e 100644
--- a/release/preview/debian10/dependabot/Dockerfile
+++ b/release/preview/debian10/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/debian10/getLatestTag.ps1 b/release/preview/debian10/getLatestTag.ps1
index f262fed60..eeab402e1 100644
--- a/release/preview/debian10/getLatestTag.ps1
+++ b/release/preview/debian10/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/preview/debian11/dependabot/Dockerfile b/release/preview/debian11/dependabot/Dockerfile
index 8a60bc3b0..6e90fb911 100644
--- a/release/preview/debian11/dependabot/Dockerfile
+++ b/release/preview/debian11/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/debian11/getLatestTag.ps1 b/release/preview/debian11/getLatestTag.ps1
index f19797bb9..187b7cf13 100644
--- a/release/preview/debian11/getLatestTag.ps1
+++ b/release/preview/debian11/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/preview/debian9/getLatestTag.ps1 b/release/preview/debian9/getLatestTag.ps1
index 4ceee128f..22da10773 100644
--- a/release/preview/debian9/getLatestTag.ps1
+++ b/release/preview/debian9/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/preview/nanoserver1809/dependabot/Dockerfile b/release/preview/nanoserver1809/dependabot/Dockerfile
index a3434bcb5..863e481c7 100644
--- a/release/preview/nanoserver1809/dependabot/Dockerfile
+++ b/release/preview/nanoserver1809/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/nanoserver1809/getLatestTag.ps1 b/release/preview/nanoserver1809/getLatestTag.ps1
index 2c7ce394f..b50d5ad3e 100644
--- a/release/preview/nanoserver1809/getLatestTag.ps1
+++ b/release/preview/nanoserver1809/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/preview/ubuntu16.04/getLatestTag.ps1 b/release/preview/ubuntu16.04/getLatestTag.ps1
index 6ef600d39..ed6a85150 100644
--- a/release/preview/ubuntu16.04/getLatestTag.ps1
+++ b/release/preview/ubuntu16.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the xenial image on
diff --git a/release/preview/ubuntu18.04/getLatestTag.ps1 b/release/preview/ubuntu18.04/getLatestTag.ps1
index 40aa9aaf9..162b83cde 100644
--- a/release/preview/ubuntu18.04/getLatestTag.ps1
+++ b/release/preview/ubuntu18.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the beaver image on
diff --git a/release/preview/windowsservercore/dependabot/Dockerfile b/release/preview/windowsservercore/dependabot/Dockerfile
index 27d50366b..de415a7f7 100644
--- a/release/preview/windowsservercore/dependabot/Dockerfile
+++ b/release/preview/windowsservercore/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
index 5ece47358..95e69a806 100644
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ b/release/preview/windowsservercore/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/servicing/centos7/getLatestTag.ps1 b/release/servicing/centos7/getLatestTag.ps1
index daaac1cc9..2d9d1ce17 100644
--- a/release/servicing/centos7/getLatestTag.ps1
+++ b/release/servicing/centos7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/servicing/debian9/getLatestTag.ps1 b/release/servicing/debian9/getLatestTag.ps1
index 4ceee128f..22da10773 100644
--- a/release/servicing/debian9/getLatestTag.ps1
+++ b/release/servicing/debian9/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/servicing/nanoserver1809/getLatestTag.ps1 b/release/servicing/nanoserver1809/getLatestTag.ps1
index 2c7ce394f..b50d5ad3e 100644
--- a/release/servicing/nanoserver1809/getLatestTag.ps1
+++ b/release/servicing/nanoserver1809/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/servicing/opensuse423/getLatestTag.ps1 b/release/servicing/opensuse423/getLatestTag.ps1
index 9d3cfb58f..5fad3693f 100644
--- a/release/servicing/opensuse423/getLatestTag.ps1
+++ b/release/servicing/opensuse423/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the opensuse image on Docker
diff --git a/release/servicing/ubuntu16.04/getLatestTag.ps1 b/release/servicing/ubuntu16.04/getLatestTag.ps1
index 6ef600d39..ed6a85150 100644
--- a/release/servicing/ubuntu16.04/getLatestTag.ps1
+++ b/release/servicing/ubuntu16.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the xenial image on
diff --git a/release/servicing/ubuntu18.04/getLatestTag.ps1 b/release/servicing/ubuntu18.04/getLatestTag.ps1
index 40aa9aaf9..162b83cde 100644
--- a/release/servicing/ubuntu18.04/getLatestTag.ps1
+++ b/release/servicing/ubuntu18.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the beaver image on
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
index c67879add..4b74754eb 100644
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ b/release/servicing/windowsservercore/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
index c90555043..c4ab43d86 100644
--- a/release/stable/alpine38/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
diff --git a/release/stable/alpine38/getLatestTag.ps1 b/release/stable/alpine38/getLatestTag.ps1
index bc836c038..1f57da10e 100644
--- a/release/stable/alpine38/getLatestTag.ps1
+++ b/release/stable/alpine38/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the Alpine image on
diff --git a/release/stable/alpine39/dependabot/Dockerfile b/release/stable/alpine39/dependabot/Dockerfile
index cf026e7c3..cf983a1b7 100644
--- a/release/stable/alpine39/dependabot/Dockerfile
+++ b/release/stable/alpine39/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index 1aa79b105..a1023b1f2 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
diff --git a/release/stable/alpine39/getLatestTag.ps1 b/release/stable/alpine39/getLatestTag.ps1
index bab6f5f80..e3832bb04 100644
--- a/release/stable/alpine39/getLatestTag.ps1
+++ b/release/stable/alpine39/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the Alpine image on
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 729716ef3..0c6fa45e5 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 ARG fromTag=bionic
diff --git a/release/stable/arm32v7/getLatestTag.ps1 b/release/stable/arm32v7/getLatestTag.ps1
index f4574e134..211008454 100644
--- a/release/stable/arm32v7/getLatestTag.ps1
+++ b/release/stable/arm32v7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/stable/centos7/getLatestTag.ps1 b/release/stable/centos7/getLatestTag.ps1
index daaac1cc9..2d9d1ce17 100644
--- a/release/stable/centos7/getLatestTag.ps1
+++ b/release/stable/centos7/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/stable/centos8/dependabot/Dockerfile b/release/stable/centos8/dependabot/Dockerfile
index 5bd787a7a..635aa6180 100644
--- a/release/stable/centos8/dependabot/Dockerfile
+++ b/release/stable/centos8/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/stable/centos8/getLatestTag.ps1 b/release/stable/centos8/getLatestTag.ps1
index 9f6c243eb..7de27c1c3 100644
--- a/release/stable/centos8/getLatestTag.ps1
+++ b/release/stable/centos8/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the CentOS image on Docker
diff --git a/release/stable/debian10/dependabot/Dockerfile b/release/stable/debian10/dependabot/Dockerfile
index 934a2d9c0..505b9d83e 100644
--- a/release/stable/debian10/dependabot/Dockerfile
+++ b/release/stable/debian10/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/stable/debian10/getLatestTag.ps1 b/release/stable/debian10/getLatestTag.ps1
index f262fed60..eeab402e1 100644
--- a/release/stable/debian10/getLatestTag.ps1
+++ b/release/stable/debian10/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/stable/debian11/dependabot/Dockerfile b/release/stable/debian11/dependabot/Dockerfile
index 8a60bc3b0..6e90fb911 100644
--- a/release/stable/debian11/dependabot/Dockerfile
+++ b/release/stable/debian11/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/stable/debian11/getLatestTag.ps1 b/release/stable/debian11/getLatestTag.ps1
index f19797bb9..187b7cf13 100644
--- a/release/stable/debian11/getLatestTag.ps1
+++ b/release/stable/debian11/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/stable/debian9/getLatestTag.ps1 b/release/stable/debian9/getLatestTag.ps1
index 4ceee128f..22da10773 100644
--- a/release/stable/debian9/getLatestTag.ps1
+++ b/release/stable/debian9/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the debian image on Docker
diff --git a/release/stable/fedora/dependabot/Dockerfile b/release/stable/fedora/dependabot/Dockerfile
index 2b4d6bd3e..78061c9c0 100644
--- a/release/stable/fedora/dependabot/Dockerfile
+++ b/release/stable/fedora/dependabot/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Dummy docker image to trigger dependabot PRs
diff --git a/release/stable/fedora/getLatestTag.ps1 b/release/stable/fedora/getLatestTag.ps1
index c9ad27d2d..11d8fada4 100644
--- a/release/stable/fedora/getLatestTag.ps1
+++ b/release/stable/fedora/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the fedora image on
diff --git a/release/stable/nanoserver1809/getLatestTag.ps1 b/release/stable/nanoserver1809/getLatestTag.ps1
index 2c7ce394f..b50d5ad3e 100644
--- a/release/stable/nanoserver1809/getLatestTag.ps1
+++ b/release/stable/nanoserver1809/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/stable/ubuntu16.04/getLatestTag.ps1 b/release/stable/ubuntu16.04/getLatestTag.ps1
index 6ef600d39..ed6a85150 100644
--- a/release/stable/ubuntu16.04/getLatestTag.ps1
+++ b/release/stable/ubuntu16.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the xenial image on
diff --git a/release/stable/ubuntu18.04/getLatestTag.ps1 b/release/stable/ubuntu18.04/getLatestTag.ps1
index 40aa9aaf9..162b83cde 100644
--- a/release/stable/ubuntu18.04/getLatestTag.ps1
+++ b/release/stable/ubuntu18.04/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the beaver image on
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
index c67879add..4b74754eb 100644
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ b/release/stable/windowsservercore/getLatestTag.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # return objects representing the tags we need to base the nanoserver image on
diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
index ed9cd84cd..5fd79fdbd 100644
--- a/release/unstable/oraclelinux/docker/Dockerfile
+++ b/release/unstable/oraclelinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Oracle Linux image with PowerShell
diff --git a/republish.ps1 b/republish.ps1
index 67a847202..28851bcef 100644
--- a/republish.ps1
+++ b/republish.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Republishes images between mcr.microsoft.com and Docker hub until mcr.microsoft.com automatically republishes to Docker hub
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 971ba23eb..6a60dcbf9 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 Set-StrictMode -Off
 
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 01096cd1f..f1ecfa202 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 # Get Docker Engine OS
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index f8d427ab7..4250e0c10 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
 #Requires -Version 6.2

From 98230f7e39251002efa1af04f0a1ec0a82a8c78e Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 13 Aug 2020 19:07:13 +0100
Subject: [PATCH 091/354] Update `LICENSE.txt` so that it's recognized as MIT
 (#479)

---
 LICENSE.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index ec481ad92..b2f52a2ba 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,11 +1,9 @@
-PowerShell Docker Files
-
-Copyright (c) Microsoft Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation.
 
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the ""Software""), to deal
+of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is

From 4ecfb0dc68e7491d1834db0c092b50ebb28cbb05 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Fri, 14 Aug 2020 17:55:41 +0100
Subject: [PATCH 092/354] Add .editorconfig file to specify charset (#481)

---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..986aba03a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true

From 771b897db27e4fc4d9bea8eb4dbdc2ba49e92b42 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 4 Sep 2020 10:07:01 -0700
Subject: [PATCH 093/354] Refactor set version to template (#483)

---
 .vsts-ci/releasePhase.yml                     | 28 +------------------
 .../setVersionStepsTemplate.yml               | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 .vsts-ci/templatesGeneric/setVersionStepsTemplate.yml

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 55c57127f..280e5023c 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -50,33 +50,7 @@ jobs:
     displayName: 'Enable ACR'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - powershell: |
-      switch('$(Channel)') {
-        'stable' {
-          $releaseTag = '$(stableReleaseTag)'
-          $version = '$(stableReleaseTag)' -replace '^v', ''
-        }
-        'preview' {
-          $releaseTag = '$(previewReleaseTag)'
-          $version = '$(previewReleaseTag)' -replace '^v', ''
-        }
-        'lts' {
-          $releaseTag = '$(ltsReleaseTag)'
-          $version = '$(ltsReleaseTag)' -replace '^v', ''
-        }
-        default {
-          throw "Unknown channel '$(Channel)'"
-        }
-      }
-      $namespace = $releaseTag.ToLowerInvariant()
-      Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
-      $version = $releaseTag -replace '^v', ''
-      $command = "vso[task.setvariable variable=version]$version"
-      Write-Host $command
-      Write-Host "##$command"
-    displayName: 'Set Version'
-    name: get
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+  - template: ./templatesGeneric/setVersionStepsTemplate.yml
 
   - pwsh: |
       Get-ChildItem env: | Out-String -Width 1000
diff --git a/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml b/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml
new file mode 100644
index 000000000..c918b137d
--- /dev/null
+++ b/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml
@@ -0,0 +1,28 @@
+steps:
+  - pwsh: |
+      switch('$(Channel)') {
+        'stable' {
+          $releaseTag = '$(stableReleaseTag)'
+          $version = '$(stableReleaseTag)' -replace '^v', ''
+        }
+        'preview' {
+          $releaseTag = '$(previewReleaseTag)'
+          $version = '$(previewReleaseTag)' -replace '^v', ''
+        }
+        'lts' {
+          $releaseTag = '$(ltsReleaseTag)'
+          $version = '$(ltsReleaseTag)' -replace '^v', ''
+        }
+        default {
+          throw "Unknown channel '$(Channel)'"
+        }
+      }
+      $namespace = $releaseTag.ToLowerInvariant()
+      Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
+      $version = $releaseTag -replace '^v', ''
+      $command = "vso[task.setvariable variable=version]$version"
+      Write-Host $command
+      Write-Host "##$command"
+    displayName: 'Set Version'
+    name: get
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))

From dd8d8c62d6cb79c1b8de6702a5644310ffaebc78 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 4 Sep 2020 10:51:05 -0700
Subject: [PATCH 094/354] Images fixes - needed for release refactor (#485)

Co-authored-by: Robert Holt <rjmholt@gmail.com>
---
 .vscode/launch.json                           | 17 ++++
 release/lts/debian11/docker/Dockerfile        |  6 +-
 release/lts/debian11/getLatestTag.ps1         | 14 ---
 release/lts/debian11/meta.json                |  3 +
 .../preview/alpine310/dependabot/Dockerfile   |  6 ++
 release/preview/alpine310/docker/Dockerfile   | 89 +++++++++++++++++++
 release/preview/alpine310/meta.json           | 18 ++++
 .../alpine310/test-deps/docker/Dockerfile     | 40 +++++++++
 release/preview/alpine310/test-deps/meta.json | 20 +++++
 release/preview/alpine311/meta.json           |  4 +-
 release/preview/alpine39/docker/Dockerfile    |  8 +-
 release/preview/alpine39/getLatestTag.ps1     | 14 ---
 release/preview/alpine39/meta.json            |  7 +-
 release/preview/debian11/docker/Dockerfile    |  6 +-
 release/preview/debian11/getLatestTag.ps1     | 14 ---
 release/preview/debian11/meta.json            |  3 +
 release/preview/debian11/test-deps/meta.json  |  2 +-
 release/preview/fedora/test-deps/meta.json    |  3 +-
 release/preview/ubuntu16.04/docker/Dockerfile |  4 +-
 release/preview/ubuntu16.04/getLatestTag.ps1  | 14 ---
 release/preview/ubuntu16.04/meta.json         |  7 +-
 release/preview/ubuntu18.04/docker/Dockerfile |  2 +-
 release/preview/ubuntu18.04/getLatestTag.ps1  | 14 ---
 release/preview/ubuntu18.04/meta.json         |  5 +-
 release/preview/ubuntu20.04/meta.json         |  2 +-
 .../stable/alpine310/dependabot/Dockerfile    |  6 ++
 release/stable/alpine310/docker/Dockerfile    | 89 +++++++++++++++++++
 release/stable/alpine310/meta.json            | 18 ++++
 .../alpine310/test-deps/docker/Dockerfile     | 40 +++++++++
 release/stable/alpine310/test-deps/meta.json  | 20 +++++
 release/stable/alpine39/docker/Dockerfile     | 10 +--
 release/stable/alpine39/getLatestTag.ps1      | 14 ---
 release/stable/alpine39/meta.json             |  5 +-
 release/stable/arm32v7/docker/Dockerfile      |  7 +-
 release/stable/arm32v7/getLatestTag.ps1       | 14 ---
 release/stable/arm32v7/meta.json              |  3 +
 release/stable/debian11/docker/Dockerfile     |  6 +-
 release/stable/debian11/getLatestTag.ps1      | 14 ---
 release/stable/debian11/meta.json             |  3 +
 release/stable/fedora/test-deps/meta.json     |  3 +-
 release/stable/ubuntu16.04/docker/Dockerfile  |  4 +-
 release/stable/ubuntu16.04/getLatestTag.ps1   | 14 ---
 release/stable/ubuntu16.04/meta.json          |  5 +-
 release/stable/ubuntu18.04/docker/Dockerfile  |  2 +-
 release/stable/ubuntu18.04/getLatestTag.ps1   | 14 ---
 release/stable/ubuntu18.04/meta.json          |  5 +-
 .../archlinux/docker/Dockerfile               |  0
 .../archlinux/meta.json                       |  0
 .../blackarch/docker/Dockerfile               |  0
 .../blackarch/meta.json                       |  0
 .../clearlinux/docker/Dockerfile              |  0
 .../clearlinux/meta.json                      |  0
 tools/getDockerTags/getDockerTags.psm1        |  4 +-
 53 files changed, 427 insertions(+), 195 deletions(-)
 delete mode 100644 release/lts/debian11/getLatestTag.ps1
 create mode 100644 release/preview/alpine310/dependabot/Dockerfile
 create mode 100644 release/preview/alpine310/docker/Dockerfile
 create mode 100644 release/preview/alpine310/meta.json
 create mode 100644 release/preview/alpine310/test-deps/docker/Dockerfile
 create mode 100644 release/preview/alpine310/test-deps/meta.json
 delete mode 100644 release/preview/alpine39/getLatestTag.ps1
 delete mode 100644 release/preview/debian11/getLatestTag.ps1
 delete mode 100644 release/preview/ubuntu16.04/getLatestTag.ps1
 delete mode 100644 release/preview/ubuntu18.04/getLatestTag.ps1
 create mode 100644 release/stable/alpine310/dependabot/Dockerfile
 create mode 100644 release/stable/alpine310/docker/Dockerfile
 create mode 100644 release/stable/alpine310/meta.json
 create mode 100644 release/stable/alpine310/test-deps/docker/Dockerfile
 create mode 100644 release/stable/alpine310/test-deps/meta.json
 delete mode 100644 release/stable/alpine39/getLatestTag.ps1
 delete mode 100644 release/stable/arm32v7/getLatestTag.ps1
 delete mode 100644 release/stable/debian11/getLatestTag.ps1
 delete mode 100644 release/stable/ubuntu16.04/getLatestTag.ps1
 delete mode 100644 release/stable/ubuntu18.04/getLatestTag.ps1
 rename release/{community-stable => unstable}/archlinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/archlinux/meta.json (100%)
 rename release/{community-stable => unstable}/blackarch/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/blackarch/meta.json (100%)
 rename release/{community-stable => unstable}/clearlinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/clearlinux/meta.json (100%)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index c65c0b877..0a251eb34 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,6 +17,23 @@
                 "-name",
                 "ubuntu16.04"
             ]
+        },
+        {
+            "name": "PowerShell: Gen Tags Json - preview - fedora",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${workspaceFolder}/build.ps1",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "-GenerateTagsYaml",
+                "-Channel",
+                "preview",
+                "-name",
+                "fedora",
+                "-format",
+                "JSON"
+            ]
         }
     ]
+
 }
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index b87075584..490024132 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -1,8 +1,6 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=bullseye-slim
-ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +21,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM debian:bullseye-slim
 
 ARG PS_VERSION=7.0.0
 ARG PS_INSTALL_VERSION=7-lts
diff --git a/release/lts/debian11/getLatestTag.ps1 b/release/lts/debian11/getLatestTag.ps1
deleted file mode 100644
index 187b7cf13..000000000
--- a/release/lts/debian11/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('bullseye-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
index f0b024143..7c48521a5 100644
--- a/release/lts/debian11/meta.json
+++ b/release/lts/debian11/meta.json
@@ -7,6 +7,9 @@
     "tagTemplates": [
         "lts-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bullseye-slim"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/preview/alpine310/dependabot/Dockerfile b/release/preview/alpine310/dependabot/Dockerfile
new file mode 100644
index 000000000..cf983a1b7
--- /dev/null
+++ b/release/preview/alpine310/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. 
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM alpine:3.10.0
diff --git a/release/preview/alpine310/docker/Dockerfile b/release/preview/alpine310/docker/Dockerfile
new file mode 100644
index 000000000..e0f517bc7
--- /dev/null
+++ b/release/preview/alpine310/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.10 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.10
+
+ARG fromTag=3.10
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine310/meta.json b/release/preview/alpine310/meta.json
new file mode 100644
index 000000000..3e4ad9762
--- /dev/null
+++ b/release/preview/alpine310/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine",
+    "tagTemplates": [
+        "#psversion#-alpine-3.10-#fulltag#",
+        "preview-alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.10"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 211
+    }
+}
diff --git a/release/preview/alpine310/test-deps/docker/Dockerfile b/release/preview/alpine310/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1fb8267a4
--- /dev/null
+++ b/release/preview/alpine310/test-deps/docker/Dockerfile
@@ -0,0 +1,40 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ARG fromTag=3.9
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine310/test-deps/meta.json b/release/preview/alpine310/test-deps/meta.json
new file mode 100644
index 000000000..3d4f95d93
--- /dev/null
+++ b/release/preview/alpine310/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine ${fromTag}",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 296
+    },
+    "TagMapping": {
+        "^.*-alpine-3.9$" : "preview-alpine-3.9",
+        "^.*-alpine-3.10$" : "preview-alpine-3.10"
+    }
+}
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 998fb3b9e..1e4e5b1de 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.11",
     "tagTemplates": [
-        "#psversion#-alpine-#tag#",
+        "#psversion#-alpine-3.11-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
@@ -13,6 +13,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 211
+        "size": 221
     }
 }
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index 7e19e97f1..faf06f5a7 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -3,11 +3,7 @@
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
 
-# Define arg(s) needed for the From statement
-ARG fromTag=3.9
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM alpine:3.9 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-preview.1
@@ -28,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM alpine:3.9
 
 ARG fromTag=3.9
 
diff --git a/release/preview/alpine39/getLatestTag.ps1 b/release/preview/alpine39/getLatestTag.ps1
deleted file mode 100644
index e3832bb04..000000000
--- a/release/preview/alpine39/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.9','3.10')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/preview/alpine39/meta.json b/release/preview/alpine39/meta.json
index ca34bd91d..45aa28f58 100644
--- a/release/preview/alpine39/meta.json
+++ b/release/preview/alpine39/meta.json
@@ -4,12 +4,15 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine",
     "tagTemplates": [
-        "#psversion#-alpine-#tag#",
+        "#psversion#-alpine-3.9-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "3.9"}
+    ],
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 211
+        "size": 225
     }
 }
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index 348b6faa6..36335aba6 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -1,8 +1,6 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=bullseye-slim
-ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +21,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM debian:bullseye-slim
 
 ARG PS_VERSION=6.2.0-preview.3
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/debian11/getLatestTag.ps1 b/release/preview/debian11/getLatestTag.ps1
deleted file mode 100644
index 187b7cf13..000000000
--- a/release/preview/debian11/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('bullseye-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index dc09fa68f..499c6f414 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -8,6 +8,9 @@
         "#psversion#-debian-#tag#",
         "preview-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bullseye-slim"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 330
diff --git a/release/preview/debian11/test-deps/meta.json b/release/preview/debian11/test-deps/meta.json
index 66c8f269a..6ea7f586b 100644
--- a/release/preview/debian11/test-deps/meta.json
+++ b/release/preview/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 332
+        "size": 350
     }
 }
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
index 728e0f6d6..aacf5c91d 100644
--- a/release/preview/fedora/test-deps/meta.json
+++ b/release/preview/fedora/test-deps/meta.json
@@ -14,6 +14,7 @@
         "size": 632
     },
     "TagMapping": {
-        "^.*-fedora-30$" : "preview-fedora-30"
+        "^.*-fedora-30$" : "preview-fedora-30",
+        "^.*-fedora-31$" : "preview-fedora-31"
     }
 }
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index e45b881d2..b5ab52d93 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -1,8 +1,6 @@
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=16.04
-ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
diff --git a/release/preview/ubuntu16.04/getLatestTag.ps1 b/release/preview/ubuntu16.04/getLatestTag.ps1
deleted file mode 100644
index ed6a85150..000000000
--- a/release/preview/ubuntu16.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the xenial image on
-
-# The versions of xenial we care about
-$shortTags = @('xenial')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'xenial-\d{8}[\.\d{1}]?' -AlternativeShortTag '16.04'
diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 3d77edcc1..991f8ce8f 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -3,11 +3,14 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
-    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#tag#",
+        "#psversion#-ubuntu-16.04-#fulltag#",
         "preview-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "xenial"}
+    ],
+    "SkipGssNtlmSspTests": false,
     "TestProperties": {
         "size": 395
     },
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 509f832d4..dac501535 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -2,7 +2,7 @@
 ARG fromTag=18.04
 ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:18.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
diff --git a/release/preview/ubuntu18.04/getLatestTag.ps1 b/release/preview/ubuntu18.04/getLatestTag.ps1
deleted file mode 100644
index 162b83cde..000000000
--- a/release/preview/ubuntu18.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the beaver image on
-
-# The versions of beaver we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'bionic-\d{8}[\.\d{1}]?' -AlternativeShortTag '18.04'
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index 7d305b9c0..167c5a0e9 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -5,9 +5,12 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#tag#",
+        "#psversion#-ubuntu-18.04-#fulltag#",
         "preview-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
index 33ab7c5fe..ebb497e94 100644
--- a/release/preview/ubuntu20.04/meta.json
+++ b/release/preview/ubuntu20.04/meta.json
@@ -8,7 +8,7 @@
         {"Tag": "20.04"}
     ],
     "tagTemplates": [
-        "#psversion#-ubuntu-#tag#",
+        "#psversion#-ubuntu-20.04-#fulltag#",
         "preview-ubuntu-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/stable/alpine310/dependabot/Dockerfile b/release/stable/alpine310/dependabot/Dockerfile
new file mode 100644
index 000000000..cf983a1b7
--- /dev/null
+++ b/release/stable/alpine310/dependabot/Dockerfile
@@ -0,0 +1,6 @@
+# Copyright (c) Microsoft Corporation. 
+# Licensed under the MIT License.
+
+# Dummy docker image to trigger dependabot PRs
+
+FROM alpine:3.10.0
diff --git a/release/stable/alpine310/docker/Dockerfile b/release/stable/alpine310/docker/Dockerfile
new file mode 100644
index 000000000..3a32ed1a4
--- /dev/null
+++ b/release/stable/alpine310/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
+
+# Define arg(s) needed for the From statement
+
+FROM alpine:3.10 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.10
+
+ARG fromTag=3.10
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine310/meta.json b/release/stable/alpine310/meta.json
new file mode 100644
index 000000000..eff2b57cf
--- /dev/null
+++ b/release/stable/alpine310/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine",
+    "tagTemplates": [
+        "#psversion#-alpine-3.10-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.10"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 175
+    }
+}
diff --git a/release/stable/alpine310/test-deps/docker/Dockerfile b/release/stable/alpine310/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1fb8267a4
--- /dev/null
+++ b/release/stable/alpine310/test-deps/docker/Dockerfile
@@ -0,0 +1,40 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ARG fromTag=3.9
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine310/test-deps/meta.json b/release/stable/alpine310/test-deps/meta.json
new file mode 100644
index 000000000..b8897cdc8
--- /dev/null
+++ b/release/stable/alpine310/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine ${fromTag}",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 255
+    },
+    "TagMapping": {
+        "^.*-alpine-3.9$" : "alpine-3.9",
+        "^.*-alpine-3.10$" : "alpine-3.10"
+    }
+}
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index a1023b1f2..cc51f9404 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -1,13 +1,9 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
 
-# Define arg(s) needed for the From statement
-ARG fromTag=3.9
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM alpine:3.9 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0
@@ -28,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM alpine:3.9
 
 ARG fromTag=3.9
 
diff --git a/release/stable/alpine39/getLatestTag.ps1 b/release/stable/alpine39/getLatestTag.ps1
deleted file mode 100644
index e3832bb04..000000000
--- a/release/stable/alpine39/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.9','3.10')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/stable/alpine39/meta.json b/release/stable/alpine39/meta.json
index e4d32f665..dd90f86f7 100644
--- a/release/stable/alpine39/meta.json
+++ b/release/stable/alpine39/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine",
     "tagTemplates": [
-        "#psversion#-alpine-#tag#",
+        "#psversion#-alpine-3.9-#fulltag#",
         "alpine-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "3.9"}
+    ],
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/stable/arm32v7/docker/Dockerfile
index 0c6fa45e5..840e68f81 100644
--- a/release/stable/arm32v7/docker/Dockerfile
+++ b/release/stable/arm32v7/docker/Dockerfile
@@ -1,10 +1,7 @@
 # Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
-ARG fromTag=bionic
-ARG imageRepo=arm32v7/ubuntu
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM arm32v7/ubuntu:bionic AS installer-env
 
 ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -39,7 +36,7 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM ${imageRepo}:${fromTag} AS final-image
+FROM arm32v7/ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7
diff --git a/release/stable/arm32v7/getLatestTag.ps1 b/release/stable/arm32v7/getLatestTag.ps1
deleted file mode 100644
index 211008454..000000000
--- a/release/stable/arm32v7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/stable/arm32v7/meta.json b/release/stable/arm32v7/meta.json
index e5c671f5e..eb33248fb 100644
--- a/release/stable/arm32v7/meta.json
+++ b/release/stable/arm32v7/meta.json
@@ -10,6 +10,9 @@
         "#psversion#-arm32v7-ubuntu-#tag#",
         "arm32v7-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 550,
         "Arm32": true
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index c7cac3319..23ea5cdc6 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -1,8 +1,6 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=bullseye-slim
-ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +21,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM debian:bullseye-slim
 
 ARG PS_VERSION=6.2.0
 ARG PS_INSTALL_VERSION=7
diff --git a/release/stable/debian11/getLatestTag.ps1 b/release/stable/debian11/getLatestTag.ps1
deleted file mode 100644
index 187b7cf13..000000000
--- a/release/stable/debian11/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('bullseye-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'bullseye-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '11' -SkipShortTagFilter
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
index 01d4573f6..97db14f0c 100644
--- a/release/stable/debian11/meta.json
+++ b/release/stable/debian11/meta.json
@@ -8,6 +8,9 @@
         "#psversion#-debian-#tag#",
         "debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bullseye-slim"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/stable/fedora/test-deps/meta.json b/release/stable/fedora/test-deps/meta.json
index 8a82bf53d..25aa08f42 100644
--- a/release/stable/fedora/test-deps/meta.json
+++ b/release/stable/fedora/test-deps/meta.json
@@ -14,6 +14,7 @@
         "size": 632
     },
     "TagMapping": {
-        "^.*-fedora-30$" : "fedora-30"
+        "^.*-fedora-30$" : "fedora-30",
+        "^.*-fedora-31$" : "fedora-31"
     }
 }
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index fc8ca0ae7..89bba1c48 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -1,8 +1,6 @@
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=16.04
-ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
diff --git a/release/stable/ubuntu16.04/getLatestTag.ps1 b/release/stable/ubuntu16.04/getLatestTag.ps1
deleted file mode 100644
index ed6a85150..000000000
--- a/release/stable/ubuntu16.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the xenial image on
-
-# The versions of xenial we care about
-$shortTags = @('xenial')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'xenial-\d{8}[\.\d{1}]?' -AlternativeShortTag '16.04'
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index 80078d4fa..b4ae74652 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "#psversion#-ubuntu-#tag#",
+        "#psversion#-ubuntu-16.04-#fulltag#",
         "ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "xenial"}
+    ],
     "SkipGssNtlmSspTests": false,
     "TestProperties": {
         "size": 395
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 21c987e28..92f6dd833 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -2,7 +2,7 @@
 ARG fromTag=18.04
 ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:18.04 AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
diff --git a/release/stable/ubuntu18.04/getLatestTag.ps1 b/release/stable/ubuntu18.04/getLatestTag.ps1
deleted file mode 100644
index 162b83cde..000000000
--- a/release/stable/ubuntu18.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the beaver image on
-
-# The versions of beaver we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'bionic-\d{8}[\.\d{1}]?' -AlternativeShortTag '18.04'
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index a830870dc..ccd1333b7 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -5,9 +5,12 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#tag#",
+        "#psversion#-ubuntu-18.04-#fulltag#",
         "ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/unstable/archlinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/archlinux/docker/Dockerfile
rename to release/unstable/archlinux/docker/Dockerfile
diff --git a/release/community-stable/archlinux/meta.json b/release/unstable/archlinux/meta.json
similarity index 100%
rename from release/community-stable/archlinux/meta.json
rename to release/unstable/archlinux/meta.json
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/unstable/blackarch/docker/Dockerfile
similarity index 100%
rename from release/community-stable/blackarch/docker/Dockerfile
rename to release/unstable/blackarch/docker/Dockerfile
diff --git a/release/community-stable/blackarch/meta.json b/release/unstable/blackarch/meta.json
similarity index 100%
rename from release/community-stable/blackarch/meta.json
rename to release/unstable/blackarch/meta.json
diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/unstable/clearlinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/clearlinux/docker/Dockerfile
rename to release/unstable/clearlinux/docker/Dockerfile
diff --git a/release/community-stable/clearlinux/meta.json b/release/unstable/clearlinux/meta.json
similarity index 100%
rename from release/community-stable/clearlinux/meta.json
rename to release/unstable/clearlinux/meta.json
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index 4250e0c10..411f0d754 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 #Requires -Version 6.2
@@ -67,8 +67,6 @@ function Get-DockerTagList
         FromTag = 'notUsed'
     }
 
-    Write-Verbose "returning $($results.count)" -Verbose
-
     return $results
 }
 

From 8f98b5e7b558e821b8c31265a396e121225a4826 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 4 Sep 2020 12:42:27 -0700
Subject: [PATCH 095/354] Refactor release into yaml with a matrix (#484)

Co-authored-by: Robert Holt <rjmholt@gmail.com>
---
 .vsts-ci/releasePipeline.yml                  | 49 ++++++++++
 .vsts-ci/templatesGeneric/deserializeTags.ps1 | 26 +++++
 .../templatesReleasePipeline/releaseJob.yml   | 90 +++++++++++++++++
 .../templatesReleasePipeline/releaseStage.yml | 46 +++++++++
 .../testAndRelease.yml                        | 12 +++
 .vsts-ci/templatesReleasePipeline/testJob.yml | 98 +++++++++++++++++++
 .../templatesReleasePipeline/testStage.yml    | 48 +++++++++
 build.ps1                                     | 55 ++++++++---
 tools/buildHelper/buildHelper.psm1            |  6 +-
 9 files changed, 414 insertions(+), 16 deletions(-)
 create mode 100644 .vsts-ci/releasePipeline.yml
 create mode 100644 .vsts-ci/templatesGeneric/deserializeTags.ps1
 create mode 100644 .vsts-ci/templatesReleasePipeline/releaseJob.yml
 create mode 100644 .vsts-ci/templatesReleasePipeline/releaseStage.yml
 create mode 100644 .vsts-ci/templatesReleasePipeline/testAndRelease.yml
 create mode 100644 .vsts-ci/templatesReleasePipeline/testJob.yml
 create mode 100644 .vsts-ci/templatesReleasePipeline/testStage.yml

diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
new file mode 100644
index 000000000..cb1205003
--- /dev/null
+++ b/.vsts-ci/releasePipeline.yml
@@ -0,0 +1,49 @@
+trigger: none
+
+# needed to disable CI trigger and allow manual trigger
+# when the branch is same as pipline source, the latest build from the source is used.
+# all environment used are for manual tasks and approvals.
+
+resources:
+  pipelines:
+  - pipeline: releasePipeline
+    source: 'Build Docker Images'
+    trigger:
+      branches:
+      - master
+
+variables:
+  runCodesignValidationInjection: false
+
+stages:
+- template: ./templatesReleasePipeline/testAndRelease.yml
+  parameters:
+    channel: "preview"
+
+- template: ./templatesReleasePipeline/testAndRelease.yml
+  parameters:
+    channel: "stable"
+
+- template: ./templatesReleasePipeline/testAndRelease.yml
+  parameters:
+    channel: "lts"
+
+- stage: Approve_Release
+  condition: always()
+  dependsOn: ['test_preview','test_stable','test_lts']
+  displayName: Approve Release
+  jobs:
+  - deployment: ReleaseAutomationKickOff
+    displayName: Approve Release
+    pool: server
+    environment: PSDockerMcrRelease
+
+- stage: Create_PR
+  condition: always()
+  dependsOn: ['Release_preview','Release_stable','Release_lts']
+  displayName: Create McrDocs Pr
+  jobs:
+  - deployment: ReleaseAutomationKickOff
+    displayName: Create McrDocs Pr
+    pool: server
+    environment: PSDockerMcrRelease
diff --git a/.vsts-ci/templatesGeneric/deserializeTags.ps1 b/.vsts-ci/templatesGeneric/deserializeTags.ps1
new file mode 100644
index 000000000..79b6574ba
--- /dev/null
+++ b/.vsts-ci/templatesGeneric/deserializeTags.ps1
@@ -0,0 +1,26 @@
+$json = Get-ChildItem "${ENV:PIPELINE_WORKSPACE}/releaseTags.json" -recurse -File
+if ($json.Count -ge 1) {
+    $jsonText = Get-Content -Raw -Path $json.FullName
+    $releaseTags = $jsonText | ConvertFrom-Json
+    Write-Verbose 'got json' -verbose
+    $releaseTagNames = $releaseTags | Get-Member -Type NoteProperty | Select-Object -ExpandProperty name
+    Write-Verbose "got names: $($releaseTagNames -join ', ')" -verbose
+
+    foreach ($tagName in $releaseTagNames) {
+        Write-Verbose "processing $tagName" -verbose
+        $value = $releaseTags.$tagName
+        $version = $value -replace '^v'
+        $versionName = $tagName -replace 'ReleaseTag', 'Version'
+        Write-Host "vso[task.setvariable variable=$tagName;]$value"
+        Write-Host "##vso[task.setvariable variable=$tagName;]$value"
+
+        $version = $value -replace '^v'
+        $versionName = $tagName -replace 'ReleaseTag', 'Version'
+        $message = "vso[task.setvariable variable={0};]{1}" -f $versionName, $version
+        Write-verbose $message -verbose
+        Write-Host "##$message"
+    }
+}
+else {
+    throw "Did not find releaseTags json"
+}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
new file mode 100644
index 000000000..071996c94
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -0,0 +1,90 @@
+parameters:
+  vmImage: 'ubuntu-16.04'
+  jobName: 'none'
+  releaseTag: ''
+  ACR: 'no'
+  maxParallel: 5
+  dependsOn: []
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    dependsOn:
+      ${{ parameters.dependsOn }}
+    strategy:
+        matrix: $[ ${{ parameters.matrix }} ]
+        maxParallel: ${{ parameters.maxParallel }}
+    variables:
+      - group: 'Staging_ACR'
+      - name: 'dockerImage'
+        value: 'powershell'
+      - name: "Channel"
+        value: ${{ parameters.channel }}
+      - name: "ACR"
+        value: ${{ parameters.ACR }}
+      - name: "releaseTag"
+        value: ${{ parameters.releaseTag }}
+
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    timeoutInMinutes: 30
+
+    displayName: ${{ parameters.jobName }}
+
+    steps:
+    - download: releasePipeline
+      displayName: Download build meta json
+      artifact: buildMeta
+      patterns: '**/*.json'
+
+    - download: releasePipeline
+      displayName: Download release tags json
+      artifact: releaseTags
+      patterns: '**/*.json'
+    - pwsh: |
+            $json = Get-ChildItem "$ENV:PIPELINE_WORKSPACE/buildmeta.json" -recurse -File
+            if($json.Count -ge 1)
+            {
+                $jsonText = Get-Content -Path $json.FullName
+                $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+                Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+                Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+            }
+            else{
+                Write-Verbose "Did not find buildmeta json" -verbose
+            }
+      displayName: 'Set Full Tag'
+
+    - task: PowerShell@2
+      displayName: 'Deserialize Release Tags'
+      inputs:
+        targetType: 'filePath'
+        filePath: .vsts-ci/templatesGeneric/deserializeTags.ps1
+        pwsh: true
+
+    - template: ../templatesGeneric/setVersionStepsTemplate.yml
+
+    - pwsh: |
+        Get-ChildItem env: | Out-String -Width 1000
+      displayName: 'Capture Environment'
+
+    - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+      displayName: 'az login'
+
+    - pwsh: |
+            az account set --subscription $(AcrSubscriptionName)
+            $tags = ./build.ps1 -GenerateTagsYaml -Channel $(channel) -Name $(imagename) -Format JSON | convertfrom-json
+            $repos = @($tags | get-member -MemberType NoteProperty  | Select-Object -ExpandProperty Name)
+
+            foreach($repo in $repos) {
+              foreach($tag in $tags.$repo.tags) {
+                $name = $repo + ":" + $tag
+                $stagingRepo = $repo -replace 'public/', '$(dockerNamespace)/'
+                Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
+                az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+              }
+            }
+      displayName: 'release - $(channel) - $(imagename)'
+
+    - pwsh: 'az logout'
+      displayName: 'az logout'
+      condition: always()
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
new file mode 100644
index 000000000..f2ebfddde
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -0,0 +1,46 @@
+parameters:
+    - name: "channel"
+      default: 'preview'
+    - name: "vmImage"
+      default: 'ubuntu-16.04'
+    - name: "acr"
+      default: 'All'
+    - name: "useacr"
+      default: 'false'
+    - name: "osFilter"
+      default: 'All'
+
+stages:
+    - stage: Release_${{ parameters.channel }}
+      condition: always()
+      dependsOn: ['Approve_Release']
+      displayName: Release ${{ parameters.channel }}
+      jobs:
+      - job: GenerateYaml_${{ parameters.channel }}
+        pool:
+            vmImage: ubuntu-16.04
+        displayName: Generate Matrix YAML ${{ parameters.channel }}
+        steps:
+        - pwsh: |
+            ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+          displayName: Generate Matrix YAML
+          condition: succeededOrFailed()
+          name: matrix
+        - pwsh: |
+            dir env:matrix_* | out-string -Width 1000
+          displayName: Capture Matrix YAML
+          condition: succeededOrFailed()
+
+      - template: ./releaseJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
+
+      - template: ./releaseJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
diff --git a/.vsts-ci/templatesReleasePipeline/testAndRelease.yml b/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
new file mode 100644
index 000000000..4c404446f
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
@@ -0,0 +1,12 @@
+parameters:
+    - name: "channel"
+      default: 'preview'
+
+stages:
+- template: ./testStage.yml
+  parameters:
+    channel: ${{ parameters.channel }}
+
+- template: ./releaseStage.yml
+  parameters:
+    channel: ${{ parameters.channel }}
diff --git a/.vsts-ci/templatesReleasePipeline/testJob.yml b/.vsts-ci/templatesReleasePipeline/testJob.yml
new file mode 100644
index 000000000..f4c09b103
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/testJob.yml
@@ -0,0 +1,98 @@
+parameters:
+  vmImage: 'ubuntu-16.04'
+  jobName: 'none'
+  releaseTag: ''
+  ACR: 'no'
+  maxParallel: 5
+  dependsOn: []
+  tafFilter: ''
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    dependsOn:
+      ${{ parameters.dependsOn }}
+    strategy:
+        matrix: $[ ${{ parameters.matrix }} ]
+        maxParallel: ${{ parameters.maxParallel }}
+    variables:
+      - group: 'Staging_ACR'
+      - name: 'dockerImage'
+        value: 'powershell'
+      - name: "Channel"
+        value: ${{ parameters.channel }}
+      - name: "ACR"
+        value: ${{ parameters.ACR }}
+      - name: "releaseTag"
+        value: ${{ parameters.releaseTag }}
+
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    timeoutInMinutes: 30
+
+    displayName: ${{ parameters.jobName }}
+
+    steps:
+    - download: releasePipeline
+      displayName: Download build meta json
+      artifact: buildMeta
+      patterns: '**/*.json'
+
+    - download: releasePipeline
+      displayName: Download release tags json
+      artifact: releaseTags
+      patterns: '**/*.json'
+
+    - pwsh: ' Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99'
+      displayName: 'Install Pester'
+    - pwsh: |
+            $json = Get-ChildItem "${ENV:PIPELINE_WORKSPACE}/buildmeta.json" -recurse -File
+            if($json.Count -ge 1)
+            {
+                $jsonText = Get-Content -Path $json.FullName
+                $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+                Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+                Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+            }
+            else{
+                Write-Verbose "Did not find buildmeta json" -verbose
+            }
+      displayName: 'Set Full Tag'
+
+    - task: PowerShell@2
+      displayName: 'Deserialize Release Tags'
+      inputs:
+        targetType: 'filePath'
+        filePath: .vsts-ci/templatesGeneric/deserializeTags.ps1
+        pwsh: true
+
+    - template: ../templatesGeneric/setVersionStepsTemplate.yml
+
+    - pwsh: |
+        Get-ChildItem env: | Out-String -Width 1000
+      displayName: 'Capture Environment'
+
+    - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p "$(dockerKey)"'
+      displayName: 'docker login'
+
+    - pwsh: |
+            $tagFilter = '${{ parameters.tagFilter}}'
+            $extraParams = @{}
+            if($tagFilter)
+            {
+              $extraParams.Add('TagFilter',$tagFilter)
+            }
+            .\build.ps1 -test -Channel $(Channel) -Pull -ImageName $(dockerHost) -name '$(ImageName)' -Version $(Version) -TestLogPostfix windows-$(Channel) -Repository $(dockerNamespace)/powershell @extraParams
+      displayName: 'Run Tests for $(Channel) - $(ImageName)'
+
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results **/test*.xml'
+      inputs:
+        testResultsFormat: NUnit
+        testResultsFiles: '**/test*.xml'
+        testRunTitle: 'Linux $(Channel)'
+      continueOnError: true
+      condition: succeededOrFailed()
+
+    - pwsh: 'docker logout'
+      displayName: 'docker logout'
+      condition: always()
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
new file mode 100644
index 000000000..ef6927a98
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -0,0 +1,48 @@
+parameters:
+    - name: "channel"
+      default: 'preview'
+    - name: "vmImage"
+      default: 'ubuntu-16.04'
+    - name: "acr"
+      default: 'All'
+    - name: "useacr"
+      default: 'false'
+    - name: "osFilter"
+      default: 'All'
+
+stages:
+    - stage: Test_${{ parameters.channel }}
+      dependsOn: []
+      displayName: Test ${{ parameters.channel }}
+      jobs:
+      - job: GenerateYaml_${{ parameters.channel }}
+        pool:
+          vmImage: ubuntu-16.04
+        displayName: Generate Matrix YAML ${{ parameters.channel }}
+        steps:
+        - pwsh: |
+            ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter ${{ parameters.osFilter }}
+          displayName: Generate Matrix YAML
+          condition: succeededOrFailed()
+          name: matrix
+        - pwsh: |
+            dir env:matrix_* | out-string -Width 1000
+          displayName: Capture Matrix YAML
+          condition: succeededOrFailed()
+
+      - template: ./testJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_windows
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+          vmImage: windows-latest
+          tagfilter: 1809
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
+
+      - template: ./testJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+          vmImage: ubuntu-latest
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
diff --git a/build.ps1 b/build.ps1
index 54e0c670f..548e43cc3 100755
--- a/build.ps1
+++ b/build.ps1
@@ -1,5 +1,5 @@
 #!/usr/bin/pwsh
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Queue Docker image build for a particular image
@@ -136,6 +136,11 @@ param(
     [string]
     $ServicingVersion,
 
+    [Parameter(ParameterSetName="GenerateTagsYaml")]
+    [ValidateSet('YAML','JSON')]
+    [string]
+    $Format = 'YAML',
+
     [switch]
     $IncludeKnownIssues,
 
@@ -185,6 +190,7 @@ DynamicParam {
     Add-ParameterAttribute -ParameterSetName 'TestByName' -Attributes $Attributes
     Add-ParameterAttribute -ParameterSetName 'localBuildByName' -Attributes $Attributes
     Add-ParameterAttribute -ParameterSetName 'GetTagsByName' -Attributes $Attributes
+    Add-ParameterAttribute -ParameterSetName 'GenerateTagsYaml' -Attributes $Attributes -Mandatory $false
 
     if($dockerFileNames.Count -gt 0)
     {
@@ -227,7 +233,7 @@ End {
 
     $toBuild = @()
     foreach ($actualChannel in $Channels) {
-        if ($PSCmdlet.ParameterSetName -match '.*ByName')
+        if ($PSBoundParameters['Name'])
         {
             # We are using the Name parameter, so assign the variable to that
             $Name = $PSBoundParameters['Name']
@@ -288,7 +294,7 @@ End {
                     {
                         $actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
                         $SubImagePath = Join-Path -Path $dockerFileName -ChildPath $allMeta.Meta.SubImage
-                        Write-Verbose -Message "getting subimage - fromtag: $($tagGroup.Name) - subimage: $($allMeta.Meta.SubImage)"
+                        Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)" -Verbose
                         $subImageAllMeta = Get-DockerImageMetaDataWrapper `
                             -DockerFileName $SubImagePath `
                             -CI:$CI.IsPresent `
@@ -492,20 +498,41 @@ End {
 
     if($GenerateTagsYaml.IsPresent)
     {
-        Write-Output "repos:"
-        foreach($repo in $tagGroups.Keys | Sort-Object)
-        {
-            Write-Output "  - repoName: $repo"
-            Write-Output "    tagGroups:"
-            foreach($tag in $tagGroups.$repo | Sort-Object -Property dockerfile)
+        if ($Format -eq 'YAML') {
+            Write-Output "repos:"
+            foreach($repo in $tagGroups.Keys | Sort-Object)
             {
-                Write-Output "    - tags: [$($tag.Tags -join ', ')]"
-                Write-Output "      osVersion: $($tag.osVersion)"
-                Write-Output "      architecture: $($tag.architecture)"
-                Write-Output "      os: $($tag.os)"
-                Write-Output "      dockerfile: $($tag.dockerfile)"
+                Write-Output "  - repoName: $repo"
+                Write-Output "    tagGroups:"
+                foreach($tag in $tagGroups.$repo | Sort-Object -Property dockerfile)
+                {
+                    Write-Output "    - tags: [$($tag.Tags -join ', ')]"
+                    Write-Output "      osVersion: $($tag.osVersion)"
+                    Write-Output "      architecture: $($tag.architecture)"
+                    Write-Output "      os: $($tag.os)"
+                    Write-Output "      dockerfile: $($tag.dockerfile)"
+                }
             }
         }
+        else {
+            $repos = @{}
+            foreach ($repo in $tagGroups.Keys | Sort-Object) {
+                $tagGroupsJson = @()
+                foreach ($tag in $tagGroups.$repo | Sort-Object -Property dockerfile) {
+                    $tagGroupsJson += @{
+                        tags         = $tag.Tags
+                        osVersion    = $tag.OsVersion
+                        architecture = $tag.architecture
+                        os           = $tag.os
+                        dockerfile   = $tag.dockerfile
+                    }
+                }
+
+                $repos.Add($repo, $tagGroupsJson)
+            }
+
+            $repos | ConvertTo-Json -Depth 10
+        }
     }
 
     if ($GenerateMatrixJson.IsPresent) {
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 6ed078f96..5be1beedc 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -276,11 +276,13 @@ function Add-ParameterAttribute {
         $Attributes,
         [Parameter(Mandatory)]
         [string]
-        $ParameterSetName
+        $ParameterSetName,
+        [bool]
+        $Mandatory = $true
     )
     $ParameterAttr = [System.Management.Automation.ParameterAttribute]::new()
     $ParameterAttr.ParameterSetName = $ParameterSetName
-    $ParameterAttr.Mandatory = $true
+    $ParameterAttr.Mandatory = $Mandatory
     $Attributes.Add($ParameterAttr) > $null
 }
 

From 505fa477766d2444b6fb32f1282f7a7c811be97a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 4 Sep 2020 15:44:57 -0700
Subject: [PATCH 096/354] Fix tags (#486)

---
 .vscode/settings.json                        |  3 +
 release/lts/debian11/meta.json               |  4 +-
 release/preview/debian11/meta.json           |  6 +-
 release/preview/fedora/meta.json             |  3 +-
 release/preview/fedora/test-deps/meta.json   |  3 +-
 release/preview/ubuntu18.04/meta.json        |  4 +-
 release/stable/alpine310/meta.json           |  2 +-
 release/stable/alpine310/test-deps/meta.json |  2 +-
 release/stable/alpine39/meta.json            |  2 +-
 release/stable/alpine39/test-deps/meta.json  |  2 +-
 release/stable/arm32v7/meta.json             |  3 +-
 release/stable/debian11/meta.json            |  6 +-
 release/stable/fedora/test-deps/meta.json    |  3 +-
 release/stable/ubuntu16.04/meta.json         |  5 +-
 release/stable/ubuntu18.04/meta.json         |  6 +-
 tools/buildHelper/buildHelper.psm1           | 91 +++++++++++++++-----
 16 files changed, 102 insertions(+), 43 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..2fc01fc36
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "powershell.codeFormatting.addWhitespaceAroundPipe": true
+}
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
index 7c48521a5..d149a05fd 100644
--- a/release/lts/debian11/meta.json
+++ b/release/lts/debian11/meta.json
@@ -5,10 +5,12 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
+        "lts-debian-#shorttag#-#fulltag#",
         "lts-debian-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bullseye-slim"}
+        {"Tag": "bullseye-slim"},
+        {"Tag": "11"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index 499c6f414..8298c7503 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -5,11 +5,13 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bullseye-slim"}
+        {"Tag": "bullseye-slim"},
+        {"Tag": "11"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/preview/fedora/meta.json b/release/preview/fedora/meta.json
index b5de07612..637c46b7d 100644
--- a/release/preview/fedora/meta.json
+++ b/release/preview/fedora/meta.json
@@ -5,7 +5,8 @@
     "osVersion": "Fedora 31",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-#tag#",
+        "#psversion#-fedora-#shorttag#-#fulltag#",
+        "#psversion#-fedora-#shorttag#",
         "preview-fedora-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
index aacf5c91d..8bbce1337 100644
--- a/release/preview/fedora/test-deps/meta.json
+++ b/release/preview/fedora/test-deps/meta.json
@@ -14,7 +14,6 @@
         "size": 632
     },
     "TagMapping": {
-        "^.*-fedora-30$" : "preview-fedora-30",
-        "^.*-fedora-31$" : "preview-fedora-31"
+        ".*" : "preview-fedora-31"
     }
 }
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index 167c5a0e9..7b6b02b3d 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -6,10 +6,12 @@
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-ubuntu-18.04-#fulltag#",
+        "#psversion#-ubuntu-bionic-#fulltag#",
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bionic"}
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
     ],
     "TestProperties": {
         "size": 355
diff --git a/release/stable/alpine310/meta.json b/release/stable/alpine310/meta.json
index eff2b57cf..18d3ecec0 100644
--- a/release/stable/alpine310/meta.json
+++ b/release/stable/alpine310/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
+    "osVersion": "Alpine 3.10",
     "tagTemplates": [
         "#psversion#-alpine-3.10-#fulltag#",
         "alpine-#shorttag#"
diff --git a/release/stable/alpine310/test-deps/meta.json b/release/stable/alpine310/test-deps/meta.json
index b8897cdc8..942d07c72 100644
--- a/release/stable/alpine310/test-deps/meta.json
+++ b/release/stable/alpine310/test-deps/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
+    "osVersion": "Alpine 3.10",
     "tagTemplates": [
         "#tag#"
     ],
diff --git a/release/stable/alpine39/meta.json b/release/stable/alpine39/meta.json
index dd90f86f7..37acbbd09 100644
--- a/release/stable/alpine39/meta.json
+++ b/release/stable/alpine39/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
+    "osVersion": "Alpine 3.9",
     "tagTemplates": [
         "#psversion#-alpine-3.9-#fulltag#",
         "alpine-#shorttag#"
diff --git a/release/stable/alpine39/test-deps/meta.json b/release/stable/alpine39/test-deps/meta.json
index b8897cdc8..7809994db 100644
--- a/release/stable/alpine39/test-deps/meta.json
+++ b/release/stable/alpine39/test-deps/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
+    "osVersion": "Alpine 3.9",
     "tagTemplates": [
         "#tag#"
     ],
diff --git a/release/stable/arm32v7/meta.json b/release/stable/arm32v7/meta.json
index eb33248fb..6cf0b1d21 100644
--- a/release/stable/arm32v7/meta.json
+++ b/release/stable/arm32v7/meta.json
@@ -7,7 +7,8 @@
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-#tag#",
+        "#psversion#-arm32v7-ubuntu-bionic-#fulltag#",
+        "#psversion#-arm32v7-ubuntu-18.04-#fulltag#",
         "arm32v7-ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
index 97db14f0c..cdeddc9c0 100644
--- a/release/stable/debian11/meta.json
+++ b/release/stable/debian11/meta.json
@@ -5,11 +5,13 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bullseye-slim"}
+        {"Tag": "bullseye-slim"},
+        {"Tag": "11"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/stable/fedora/test-deps/meta.json b/release/stable/fedora/test-deps/meta.json
index 25aa08f42..494e2ba0b 100644
--- a/release/stable/fedora/test-deps/meta.json
+++ b/release/stable/fedora/test-deps/meta.json
@@ -14,7 +14,6 @@
         "size": 632
     },
     "TagMapping": {
-        "^.*-fedora-30$" : "fedora-30",
-        "^.*-fedora-31$" : "fedora-31"
+        ".*" : "fedora-30"
     }
 }
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index b4ae74652..26182f14c 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -4,11 +4,12 @@
     "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "#psversion#-ubuntu-16.04-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
         "ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "xenial"}
+        {"Tag": "xenial"},
+        {"Tag": "16.04"}
     ],
     "SkipGssNtlmSspTests": false,
     "TestProperties": {
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index ccd1333b7..2286d5636 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -5,11 +5,13 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-18.04-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bionic"}
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
     ],
     "TestProperties": {
         "size": 355
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 5be1beedc..8fba43ad2 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -728,7 +728,7 @@ function Get-TagData
     param(
         [string[]]
         $TagsTemplates,
-        [object]
+        [Microsoft.PowerShell.Commands.GroupInfo[]]
         $TagGroup,
         [string]
         $Version,
@@ -740,31 +740,14 @@ function Get-TagData
 
     $actualTags = @()
     $tagList = @()
-    foreach($tag in $tagGroup.Group) {
-        foreach ($tagTemplate in $tagsTemplates) {
-            # replace the tag token with the tag
-            if ($tagTemplate -match '#tag#') {
-                $actualTag = $tagTemplate -replace '#tag#', $tag.Tag
-            }
-            elseif ($tagTemplate -match '#shorttag#' -and $tag.Type -eq 'Short') {
-                $actualTag = $tagTemplate -replace '#shorttag#', $tag.Tag
-            }
-            elseif ($tagTemplate -match '#fulltag#' -and $tag.Type -eq 'Full') {
-                $actualTag = $tagTemplate -replace '#fulltag#', $tag.Tag
-            }
-            else {
-                # skip if the type of tag token doesn't match the type of tag
-                Write-Verbose -Message "Skipping $($tag.Tag) - $tagTemplate, token doesn't match template"
-                continue
-            }
-
-            # Replace the the psversion token with the powershell version in the tag
-            $actualTag = $actualTag -replace '#psversion#', $Version
-            $actualTag = $actualTag.ToLowerInvariant()
+    foreach ($tagTemplate in $tagsTemplates) {
+        $templateActualTags = Format-TagTemplate -TagTemplate $tagTemplate -TagGroup $TagGroup -Version $Version
+        foreach ($actualTag in $templateActualTags) {
             $actualTags += "${ImageName}/${Repository}:$actualTag"
             $tagList += $actualTag
-            $fromTag = $Tag.FromTag
         }
+
+        $fromTag = $TagGroup.Name
     }
 
     return [TagData]@{
@@ -775,6 +758,68 @@ function Get-TagData
     }
 }
 
+function Format-TagTemplate {
+    param(
+        [parameter(Mandatory)]
+        [string]
+        $TagTemplate,
+
+        [parameter(Mandatory)]
+        [Microsoft.PowerShell.Commands.GroupInfo[]]
+        $TagGroup,
+
+        [parameter(Mandatory)]
+        [string]
+        $Version
+    )
+
+    $currentTag = $TagTemplate
+
+    $fullTags = $tagGroup.Group | Where-Object {$_.Type -eq 'Full'}
+
+    $actualMatrixTagTemplates = @()
+    foreach($tag in $tagGroup.Group) {
+        # replace the tag token with the tag
+        if ($currentTag -match '#tag#') {
+            $actualMatrixTagTemplates += $currentTag.Replace('#tag#', $tag.Tag)
+        }
+        elseif ($currentTag -match '#shorttag#' -and $tag.Type -eq 'Short') {
+            $actualMatrixTagTemplates += $currentTag.Replace('#shorttag#', $tag.Tag)
+        }
+        elseif ($currentTag -notmatch '#shorttag#' -and $currentTag -match '#fulltag#' -and $tag.Type -eq 'Full') {
+            $actualMatrixTagTemplates += $currentTag.Replace('#fulltag#', $tag.Tag)
+        }
+    }
+
+    $actualFullTags = @()
+    if ($fullTags) {
+        foreach ($tag in $fullTags) {
+            foreach($currentTag in $actualMatrixTagTemplates)
+            {
+                if ($currentTag -match '#fulltag#' -and $tag.Type -eq 'Full') {
+                    $actualFullTags += $currentTag.Replace('#fulltag#', $tag.Tag)
+                }
+                else {
+                    $actualFullTags += $currentTag
+                }
+            }
+        }
+    }
+    else {
+        $actualFullTags = $actualMatrixTagTemplates
+    }
+
+    $actualTags = @()
+    foreach ($currentTag in $actualFullTags) {
+        # Replace the the psversion token with the powershell version in the tag
+        $currentTag = $currentTag -replace '#psversion#', $Version
+        $currentTag = $currentTag.ToLowerInvariant()
+        $actualTags += $currentTag
+    }
+
+    return $actualTags;
+}
+
 class SasData{
     [string] $SasUrl
     [Uri] $SasUri

From ffce3756edda4f7dfd50e498205d82dceaa62308 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 8 Sep 2020 17:50:10 -0700
Subject: [PATCH 097/354] Fix Alpine 3.10 preview size (#488)

---
 release/preview/alpine310/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/alpine310/meta.json b/release/preview/alpine310/meta.json
index 3e4ad9762..27ea77f58 100644
--- a/release/preview/alpine310/meta.json
+++ b/release/preview/alpine310/meta.json
@@ -13,6 +13,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 211
+        "size": 225
     }
 }

From 4baf61f69e2292173b92c1b7494d7ff3f9e24870 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 9 Sep 2020 10:45:33 -0700
Subject: [PATCH 098/354] Fix release (#489)

---
 .vsts-ci/templatesReleasePipeline/releaseJob.yml | 2 +-
 .vsts-ci/templatesReleasePipeline/testStage.yml  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
index 071996c94..985eadc07 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -72,7 +72,7 @@ jobs:
 
     - pwsh: |
             az account set --subscription $(AcrSubscriptionName)
-            $tags = ./build.ps1 -GenerateTagsYaml -Channel $(channel) -Name $(imagename) -Format JSON | convertfrom-json
+            $tags = ./build.ps1 -GenerateTagsYaml -Channel $(channel) -Name $(imagename) -Format JSON -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion) | convertfrom-json
             $repos = @($tags | get-member -MemberType NoteProperty  | Select-Object -ExpandProperty Name)
 
             foreach($repo in $repos) {
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index ef6927a98..74266923a 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -14,6 +14,9 @@ stages:
     - stage: Test_${{ parameters.channel }}
       dependsOn: []
       displayName: Test ${{ parameters.channel }}
+      variables:
+        - name: docker_release
+          value: True
       jobs:
       - job: GenerateYaml_${{ parameters.channel }}
         pool:

From 1323aa92b738f12dea45661332b3db5eecc756ad Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Wed, 9 Sep 2020 12:02:40 -0700
Subject: [PATCH 099/354] Disable telemetry before running pwsh when creating
 docker image (#482)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/community-stable/amazonlinux/docker/Dockerfile | 2 ++
 release/community-stable/kalilinux/docker/Dockerfile   | 2 ++
 release/community-stable/parrotsec/docker/Dockerfile   | 2 ++
 release/community-stable/photon/docker/Dockerfile      | 2 ++
 release/lts/alpine39/docker/Dockerfile                 | 2 ++
 release/lts/centos7/docker/Dockerfile                  | 2 ++
 release/lts/centos8/docker/Dockerfile                  | 2 ++
 release/lts/debian10/docker/Dockerfile                 | 2 ++
 release/lts/debian11/docker/Dockerfile                 | 2 ++
 release/lts/debian9/docker/Dockerfile                  | 2 ++
 release/lts/fedora/docker/Dockerfile                   | 2 ++
 release/lts/nanoserver1809/docker/Dockerfile           | 6 ++++++
 release/lts/ubuntu16.04/docker/Dockerfile              | 2 ++
 release/lts/ubuntu18.04/docker/Dockerfile              | 2 ++
 release/lts/windowsservercore/docker/Dockerfile        | 6 +++++-
 release/preview/alpine311/docker/Dockerfile            | 2 ++
 release/preview/alpine39/docker/Dockerfile             | 2 ++
 release/preview/centos7/docker/Dockerfile              | 2 ++
 release/preview/centos8/docker/Dockerfile              | 2 ++
 release/preview/debian10/docker/Dockerfile             | 2 ++
 release/preview/debian11/docker/Dockerfile             | 2 ++
 release/preview/debian11/meta.json                     | 2 +-
 release/preview/debian9/docker/Dockerfile              | 2 ++
 release/preview/fedora/docker/Dockerfile               | 2 ++
 release/preview/nanoserver1809/docker/Dockerfile       | 6 ++++++
 release/preview/ubuntu16.04/docker/Dockerfile          | 2 ++
 release/preview/ubuntu18.04/docker/Dockerfile          | 2 ++
 release/preview/ubuntu20.04/docker/Dockerfile          | 2 ++
 release/preview/windowsservercore/docker/Dockerfile    | 6 +++++-
 release/servicing/centos7/docker/Dockerfile            | 2 ++
 release/servicing/debian9/docker/Dockerfile            | 2 ++
 release/servicing/nanoserver1809/docker/Dockerfile     | 6 ++++++
 release/servicing/opensuse423/docker/Dockerfile        | 2 ++
 release/servicing/ubuntu16.04/docker/Dockerfile        | 2 ++
 release/servicing/ubuntu18.04/docker/Dockerfile        | 2 ++
 release/servicing/windowsservercore/docker/Dockerfile  | 6 +++++-
 release/stable/alpine38/docker/Dockerfile              | 2 ++
 release/stable/alpine39/docker/Dockerfile              | 2 ++
 release/stable/centos7/docker/Dockerfile               | 2 ++
 release/stable/centos8/docker/Dockerfile               | 2 ++
 release/stable/debian10/docker/Dockerfile              | 2 ++
 release/stable/debian11/docker/Dockerfile              | 2 ++
 release/stable/debian9/docker/Dockerfile               | 2 ++
 release/stable/fedora/docker/Dockerfile                | 2 ++
 release/stable/nanoserver1809/docker/Dockerfile        | 6 ++++++
 release/stable/ubuntu16.04/docker/Dockerfile           | 2 ++
 release/stable/ubuntu18.04/docker/Dockerfile           | 2 ++
 release/stable/windowsservercore/docker/Dockerfile     | 6 +++++-
 release/unstable/archlinux/docker/Dockerfile           | 2 ++
 release/unstable/blackarch/docker/Dockerfile           | 2 ++
 release/unstable/clearlinux/docker/Dockerfile          | 2 ++
 release/unstable/oraclelinux/docker/Dockerfile         | 2 ++
 52 files changed, 131 insertions(+), 5 deletions(-)

diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index 7b1a9ca9f..a60bd9848 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -49,6 +49,8 @@ RUN \
     # remove powershell package
     && rm -f /tmp/powershell-linux.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index 5eecdd116..7ff41dc26 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -59,6 +59,8 @@ RUN \
     # remove powershell package
     && rm -f /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile
index cd309a9d5..175c6f99b 100644
--- a/release/community-stable/parrotsec/docker/Dockerfile
+++ b/release/community-stable/parrotsec/docker/Dockerfile
@@ -64,6 +64,8 @@ RUN \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile
index 48d33f5ff..31f3170c2 100644
--- a/release/community-stable/photon/docker/Dockerfile
+++ b/release/community-stable/photon/docker/Dockerfile
@@ -81,6 +81,8 @@ RUN \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
index 911963ae6..cef70ce3c 100644
--- a/release/lts/alpine39/docker/Dockerfile
+++ b/release/lts/alpine39/docker/Dockerfile
@@ -79,6 +79,8 @@ RUN apk add --no-cache \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index 5f9640a3e..42b4f4624 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -40,6 +40,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index 97ebb96dd..54941dd10 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index b65580ee3..b17eb1b94 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -78,6 +78,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh-lts symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
index 490024132..75f6e8561 100644
--- a/release/lts/debian11/docker/Dockerfile
+++ b/release/lts/debian11/docker/Dockerfile
@@ -76,6 +76,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh-lts symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index 6aef923fd..9f2a8229c 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -44,6 +44,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
index 02d6298db..d953530a6 100644
--- a/release/lts/fedora/docker/Dockerfile
+++ b/release/lts/fedora/docker/Dockerfile
@@ -40,6 +40,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && echo "starting FEDORA-2019-27e7b92407" \
     # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
     # to do this, upgrade libmodulemd1, if it is installed
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
index 94dc98404..db7ff4bf9 100755
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -14,6 +14,9 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ARG PS_PACKAGE_URL_BASE64
@@ -84,4 +87,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 7a48b58df..e0b928a26 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 118100ff5..228cd239c 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore/docker/Dockerfile
index 4406d4f96..09c4df65f 100755
--- a/release/lts/windowsservercore/docker/Dockerfile
+++ b/release/lts/windowsservercore/docker/Dockerfile
@@ -40,7 +40,8 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
@@ -62,4 +63,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index 7103571bf..132ea76fd 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -73,6 +73,8 @@ RUN apk add --no-cache \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
index faf06f5a7..574eb5426 100644
--- a/release/preview/alpine39/docker/Dockerfile
+++ b/release/preview/alpine39/docker/Dockerfile
@@ -75,6 +75,8 @@ RUN apk add --no-cache \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index e9d5e1ee9..ddcede43b 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index 26008d7ee..7161c2c45 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -42,6 +42,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index b01d0c47c..d4e118db0 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -76,6 +76,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index 36335aba6..adc25aef2 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -74,6 +74,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index 8298c7503..112274e80 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -15,7 +15,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 330
+        "size": 350
     }
 }
 
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 67f627498..70c1544a4 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -45,6 +45,8 @@ RUN apt-get update \
     && rm /tmp/powershell.deb \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
index 573bd1e47..3e6b15f20 100644
--- a/release/preview/fedora/docker/Dockerfile
+++ b/release/preview/fedora/docker/Dockerfile
@@ -38,6 +38,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && echo "starting FEDORA-2019-27e7b92407" \
     # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
     # to do this, upgrade libmodulemd1, if it is installed
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index 94dc98404..db7ff4bf9 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -14,6 +14,9 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ARG PS_PACKAGE_URL_BASE64
@@ -84,4 +87,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index b5ab52d93..2ee0776d6 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -40,6 +40,8 @@ RUN apt-get update \
     && rm /tmp/powershell.deb \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index dac501535..73dc85593 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -42,6 +42,8 @@ RUN apt-get update \
     && rm /tmp/powershell.deb \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index 3af27e43b..13d403367 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -73,6 +73,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile
index b2e9274d6..30c115776 100755
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore/docker/Dockerfile
@@ -40,7 +40,8 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
@@ -62,4 +63,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index d77c97cb7..d62030878 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -36,6 +36,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index f6653e269..53f5282dd 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -43,6 +43,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index 922ed5b5d..649b984b8 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -14,6 +14,9 @@ ARG PS_VERSION=6.2.0
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ARG PS_PACKAGE_URL_BASE64
@@ -79,4 +82,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index 4c848c848..fda993209 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -72,6 +72,8 @@ RUN zypper --non-interactive update --skip-interactive \
     # remove package manager log file
     && rm -f /var/log/zypp/history /var/log/zypper.log \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index 94072afab..8251478fb 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -40,6 +40,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index 184c5aec6..2c1ae75d2 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -40,6 +40,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index c9bb2e10c..871ba36ce 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -39,7 +39,8 @@ ENV ProgramFiles="C:\Program Files" `
     LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe"
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
@@ -61,4 +62,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
index c4ab43d86..9544e0588 100644
--- a/release/stable/alpine38/docker/Dockerfile
+++ b/release/stable/alpine38/docker/Dockerfile
@@ -75,6 +75,8 @@ RUN apk add --no-cache \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
index cc51f9404..7be5eba7f 100644
--- a/release/stable/alpine39/docker/Dockerfile
+++ b/release/stable/alpine39/docker/Dockerfile
@@ -73,6 +73,8 @@ RUN apk add --no-cache \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index d77c97cb7..d62030878 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -36,6 +36,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index e00308762..817ac3097 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -42,6 +42,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index b4f664ef8..236cc1f37 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -76,6 +76,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index 23ea5cdc6..bdf05a54d 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -74,6 +74,8 @@ RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 644a231ac..6418e45e2 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -43,6 +43,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
index e82132b5d..72732d6e9 100644
--- a/release/stable/fedora/docker/Dockerfile
+++ b/release/stable/fedora/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && echo "starting FEDORA-2019-27e7b92407" \
     # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
     # to do this, upgrade libmodulemd1, if it is installed
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index 810777582..1d6ead42d 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -16,6 +16,9 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
 ARG PS_PACKAGE_URL_BASE64
 
 RUN Write-host "Verifying valid Version..."; `
@@ -82,4 +85,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index 89bba1c48..70633b9f6 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -39,6 +39,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 92f6dd833..3473e54d6 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -41,6 +41,8 @@ RUN apt-get update \
     # remove powershell package
     && rm /tmp/powershell.deb \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile
index 5d3600605..007e1a4a3 100755
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore/docker/Dockerfile
@@ -40,7 +40,8 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
@@ -62,4 +63,7 @@ RUN pwsh `
             Start-Sleep -Seconds 6 ; `
           }"
 
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
 CMD ["pwsh.exe"]
diff --git a/release/unstable/archlinux/docker/Dockerfile b/release/unstable/archlinux/docker/Dockerfile
index b08eaed4f..e7169c640 100644
--- a/release/unstable/archlinux/docker/Dockerfile
+++ b/release/unstable/archlinux/docker/Dockerfile
@@ -97,6 +97,8 @@ RUN \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/unstable/blackarch/docker/Dockerfile b/release/unstable/blackarch/docker/Dockerfile
index 464facc25..21ac0c626 100644
--- a/release/unstable/blackarch/docker/Dockerfile
+++ b/release/unstable/blackarch/docker/Dockerfile
@@ -112,6 +112,8 @@ RUN \
     # Give all user execute permissions and remove write permissions for others
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/unstable/clearlinux/docker/Dockerfile b/release/unstable/clearlinux/docker/Dockerfile
index 5a28c7283..00c42babb 100644
--- a/release/unstable/clearlinux/docker/Dockerfile
+++ b/release/unstable/clearlinux/docker/Dockerfile
@@ -43,6 +43,8 @@ RUN \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
index 5fd79fdbd..08475a04f 100644
--- a/release/unstable/oraclelinux/docker/Dockerfile
+++ b/release/unstable/oraclelinux/docker/Dockerfile
@@ -49,6 +49,8 @@ RUN \
     # remove powershell package
     && rm -f /tmp/powershell-linux.rpm \
     # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \

From c54a4507b83f049bbe9fc0970aae8cea030e80c3 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 7 Oct 2020 18:34:31 -0400
Subject: [PATCH 100/354] Removed fulltags in nanoserver dockerfile, replaced
 with 1809 value (#493)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .github/dependabot.yml                        |  2 +-
 .../preview/nanoserver1809/docker/Dockerfile  |  7 +-
 .../preview/nanoserver1809/getLatestTag.ps1   | 21 -----
 release/preview/nanoserver1809/meta.json      | 14 +--
 .../preview/nanoserver1903/docker/Dockerfile  | 90 +++++++++++++++++++
 release/preview/nanoserver1903/meta.json      | 20 +++++
 .../preview/nanoserver1909/docker/Dockerfile  | 90 +++++++++++++++++++
 release/preview/nanoserver1909/meta.json      | 20 +++++
 .../dependabot/Dockerfile                     |  0
 .../preview/nanoserver2004/docker/Dockerfile  | 90 +++++++++++++++++++
 release/preview/nanoserver2004/meta.json      | 20 +++++
 11 files changed, 336 insertions(+), 38 deletions(-)
 delete mode 100644 release/preview/nanoserver1809/getLatestTag.ps1
 create mode 100644 release/preview/nanoserver1903/docker/Dockerfile
 create mode 100644 release/preview/nanoserver1903/meta.json
 create mode 100644 release/preview/nanoserver1909/docker/Dockerfile
 create mode 100644 release/preview/nanoserver1909/meta.json
 rename release/preview/{nanoserver1809 => nanoserver2004}/dependabot/Dockerfile (100%)
 create mode 100644 release/preview/nanoserver2004/docker/Dockerfile
 create mode 100644 release/preview/nanoserver2004/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0c02e9b7d..7207a5277 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -34,7 +34,7 @@ updates:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/nanoserver1809/dependabot"
+    directory: "/release/preview/nanoserver2004/dependabot"
     schedule:
       interval: "weekly"
 
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index db7ff4bf9..a9c77428f 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -1,6 +1,5 @@
 # escape=`
 # Args used by from statements must be defined here:
-ARG fromTag=1709
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
 ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
@@ -40,9 +39,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG fromTag=1709
+FROM ${NanoServerRepo}:1809
 
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
@@ -55,7 +52,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
     WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
 
 ### Begin workaround ###
 # Note that changing user on nanoserver is not recommended
diff --git a/release/preview/nanoserver1809/getLatestTag.ps1 b/release/preview/nanoserver1809/getLatestTag.ps1
deleted file mode 100644
index b50d5ad3e..000000000
--- a/release/preview/nanoserver1809/getLatestTag.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
-
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index c9c911e89..87793835c 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -1,23 +1,15 @@
 {
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
+    "osVersion": "Nano Server, version 1809",
     "shortTags": [
         {
             "Tag": "1809"
-        },
-        {
-            "Tag": "1903"
-        },
-        {
-            "Tag": "1909"
-        },
-        {
-            "Tag": "2004"
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#tag#",
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1809-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/preview/nanoserver1903/docker/Dockerfile b/release/preview/nanoserver1903/docker/Dockerfile
new file mode 100644
index 000000000..56829288e
--- /dev/null
+++ b/release/preview/nanoserver1903/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1903
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver1903/meta.json b/release/preview/nanoserver1903/meta.json
new file mode 100644
index 000000000..70847a159
--- /dev/null
+++ b/release/preview/nanoserver1903/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1903-#fulltag#",
+        "preview-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/nanoserver1909/docker/Dockerfile b/release/preview/nanoserver1909/docker/Dockerfile
new file mode 100644
index 000000000..9f27cbe69
--- /dev/null
+++ b/release/preview/nanoserver1909/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1909
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver1909/meta.json b/release/preview/nanoserver1909/meta.json
new file mode 100644
index 000000000..b9406d7c6
--- /dev/null
+++ b/release/preview/nanoserver1909/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1909-#fulltag#",
+        "preview-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/nanoserver1809/dependabot/Dockerfile b/release/preview/nanoserver2004/dependabot/Dockerfile
similarity index 100%
rename from release/preview/nanoserver1809/dependabot/Dockerfile
rename to release/preview/nanoserver2004/dependabot/Dockerfile
diff --git a/release/preview/nanoserver2004/docker/Dockerfile b/release/preview/nanoserver2004/docker/Dockerfile
new file mode 100644
index 000000000..f6ccbc775
--- /dev/null
+++ b/release/preview/nanoserver2004/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:2004
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver2004/meta.json b/release/preview/nanoserver2004/meta.json
new file mode 100644
index 000000000..4cd79b414
--- /dev/null
+++ b/release/preview/nanoserver2004/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-2004-#fulltag#",
+        "preview-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}

From 929fb44bfb5cb7341a75ad6020ee5ba480da8fb2 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 12 Oct 2020 19:11:41 -0400
Subject: [PATCH 101/354] Changed fulltags for nanoserver lts and stable (#495)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/vsts-arm-ci.yml                      |  2 +-
 release/lts/nanoserver1809/docker/Dockerfile  |  7 +-
 release/lts/nanoserver1809/getLatestTag.ps1   | 21 -----
 release/lts/nanoserver1809/meta.json          | 14 +--
 release/lts/nanoserver1903/docker/Dockerfile  | 90 +++++++++++++++++++
 release/lts/nanoserver1903/meta.json          | 19 ++++
 release/lts/nanoserver1909/docker/Dockerfile  | 90 +++++++++++++++++++
 release/lts/nanoserver1909/meta.json          | 19 ++++
 .../dependabot/Dockerfile                     |  0
 release/lts/nanoserver2004/docker/Dockerfile  | 90 +++++++++++++++++++
 release/lts/nanoserver2004/meta.json          | 19 ++++
 .../stable/nanoserver1809/docker/Dockerfile   |  7 +-
 .../stable/nanoserver1809/getLatestTag.ps1    | 21 -----
 release/stable/nanoserver1809/meta.json       | 14 +--
 .../stable/nanoserver1903/docker/Dockerfile   | 88 ++++++++++++++++++
 release/stable/nanoserver1903/meta.json       | 20 +++++
 .../stable/nanoserver1909/docker/Dockerfile   | 88 ++++++++++++++++++
 release/stable/nanoserver1909/meta.json       | 20 +++++
 .../stable/nanoserver2004/docker/Dockerfile   | 88 ++++++++++++++++++
 release/stable/nanoserver2004/meta.json       | 20 +++++
 20 files changed, 662 insertions(+), 75 deletions(-)
 delete mode 100644 release/lts/nanoserver1809/getLatestTag.ps1
 create mode 100644 release/lts/nanoserver1903/docker/Dockerfile
 create mode 100644 release/lts/nanoserver1903/meta.json
 create mode 100644 release/lts/nanoserver1909/docker/Dockerfile
 create mode 100644 release/lts/nanoserver1909/meta.json
 rename release/lts/{nanoserver1809 => nanoserver2004}/dependabot/Dockerfile (100%)
 create mode 100644 release/lts/nanoserver2004/docker/Dockerfile
 create mode 100644 release/lts/nanoserver2004/meta.json
 delete mode 100644 release/stable/nanoserver1809/getLatestTag.ps1
 create mode 100644 release/stable/nanoserver1903/docker/Dockerfile
 create mode 100644 release/stable/nanoserver1903/meta.json
 create mode 100644 release/stable/nanoserver1909/docker/Dockerfile
 create mode 100644 release/stable/nanoserver1909/meta.json
 create mode 100644 release/stable/nanoserver2004/docker/Dockerfile
 create mode 100644 release/stable/nanoserver2004/meta.json

diff --git a/.vsts-ci/vsts-arm-ci.yml b/.vsts-ci/vsts-arm-ci.yml
index 6fc4a1e44..4ab60490f 100644
--- a/.vsts-ci/vsts-arm-ci.yml
+++ b/.vsts-ci/vsts-arm-ci.yml
@@ -13,7 +13,7 @@ stages:
       channel: stable
       acr: OnlyAcr
       useacr: true
-      osFilter: Linux
+      winCiParameter: ''
   - template: stage.yml
     parameters:
       channel: preview
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
index db7ff4bf9..a9c77428f 100755
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -1,6 +1,5 @@
 # escape=`
 # Args used by from statements must be defined here:
-ARG fromTag=1709
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
 ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
@@ -40,9 +39,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG fromTag=1709
+FROM ${NanoServerRepo}:1809
 
 ARG IMAGE_NAME=mcr.microsoft.com/powershell
 
@@ -55,7 +52,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
     WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
 
 ### Begin workaround ###
 # Note that changing user on nanoserver is not recommended
diff --git a/release/lts/nanoserver1809/getLatestTag.ps1 b/release/lts/nanoserver1809/getLatestTag.ps1
deleted file mode 100644
index b50d5ad3e..000000000
--- a/release/lts/nanoserver1809/getLatestTag.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
-
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
index 939784ba9..207767dc9 100644
--- a/release/lts/nanoserver1809/meta.json
+++ b/release/lts/nanoserver1809/meta.json
@@ -1,23 +1,15 @@
 {
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
+    "osVersion": "Nano Server, version 1809",
     "shortTags": [
         {
             "Tag": "1809"
-        },
-        {
-            "Tag": "1903"
-        },
-        {
-            "Tag": "1909"
-        },
-        {
-            "Tag": "2004"
         }
     ],
     "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-1809-#fulltag#"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/lts/nanoserver1903/docker/Dockerfile b/release/lts/nanoserver1903/docker/Dockerfile
new file mode 100644
index 000000000..56829288e
--- /dev/null
+++ b/release/lts/nanoserver1903/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1903
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1903/meta.json b/release/lts/nanoserver1903/meta.json
new file mode 100644
index 000000000..346f7c977
--- /dev/null
+++ b/release/lts/nanoserver1903/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-1903-#fulltag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/lts/nanoserver1909/docker/Dockerfile b/release/lts/nanoserver1909/docker/Dockerfile
new file mode 100644
index 000000000..9f27cbe69
--- /dev/null
+++ b/release/lts/nanoserver1909/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1909
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1909/meta.json b/release/lts/nanoserver1909/meta.json
new file mode 100644
index 000000000..2745eef93
--- /dev/null
+++ b/release/lts/nanoserver1909/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-1909-#fulltag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/lts/nanoserver1809/dependabot/Dockerfile b/release/lts/nanoserver2004/dependabot/Dockerfile
similarity index 100%
rename from release/lts/nanoserver1809/dependabot/Dockerfile
rename to release/lts/nanoserver2004/dependabot/Dockerfile
diff --git a/release/lts/nanoserver2004/docker/Dockerfile b/release/lts/nanoserver2004/docker/Dockerfile
new file mode 100644
index 000000000..f6ccbc775
--- /dev/null
+++ b/release/lts/nanoserver2004/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:2004
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver2004/meta.json b/release/lts/nanoserver2004/meta.json
new file mode 100644
index 000000000..c563f48cf
--- /dev/null
+++ b/release/lts/nanoserver2004/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-2004-#fulltag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index 1d6ead42d..ee250469c 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -1,6 +1,5 @@
 # escape=`
 # Args used by from statements must be defined here:
-ARG fromTag=1709
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
 ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
@@ -40,9 +39,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-ARG fromTag=1709
+FROM ${NanoServerRepo}:1809
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
@@ -53,7 +50,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
     WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-${fromTag}"
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
 
 ### Begin workaround ###
 # Note that changing user on nanoserver is not recommended
diff --git a/release/stable/nanoserver1809/getLatestTag.ps1 b/release/stable/nanoserver1809/getLatestTag.ps1
deleted file mode 100644
index b50d5ad3e..000000000
--- a/release/stable/nanoserver1809/getLatestTag.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
-
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index f5d25ef47..9ed505979 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -1,23 +1,15 @@
 {
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
+    "osVersion": "Nano Server, version 1809",
     "shortTags": [
         {
             "Tag": "1809"
-        },
-        {
-            "Tag": "1903"
-        },
-        {
-            "Tag": "1909"
-        },
-        {
-            "Tag": "2004"
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#tag#",
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1809-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/stable/nanoserver1903/docker/Dockerfile b/release/stable/nanoserver1903/docker/Dockerfile
new file mode 100644
index 000000000..319e27d66
--- /dev/null
+++ b/release/stable/nanoserver1903/docker/Dockerfile
@@ -0,0 +1,88 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1903
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver1903/meta.json b/release/stable/nanoserver1903/meta.json
new file mode 100644
index 000000000..144509755
--- /dev/null
+++ b/release/stable/nanoserver1903/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1903-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/nanoserver1909/docker/Dockerfile b/release/stable/nanoserver1909/docker/Dockerfile
new file mode 100644
index 000000000..d682d613d
--- /dev/null
+++ b/release/stable/nanoserver1909/docker/Dockerfile
@@ -0,0 +1,88 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver1909/meta.json b/release/stable/nanoserver1909/meta.json
new file mode 100644
index 000000000..167c4cd00
--- /dev/null
+++ b/release/stable/nanoserver1909/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1909-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/nanoserver2004/docker/Dockerfile b/release/stable/nanoserver2004/docker/Dockerfile
new file mode 100644
index 000000000..4382b0d98
--- /dev/null
+++ b/release/stable/nanoserver2004/docker/Dockerfile
@@ -0,0 +1,88 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver2004/meta.json b/release/stable/nanoserver2004/meta.json
new file mode 100644
index 000000000..fa6f042a6
--- /dev/null
+++ b/release/stable/nanoserver2004/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-2004-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}

From 05b279b992e21d4bff27ea98623f4d0b3f8d3a17 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Tue, 13 Oct 2020 14:42:46 -0400
Subject: [PATCH 102/354] Remove Alpine 3.8 and 3.9 (#497)

---
 .github/dependabot.yml                        | 10 --
 release/lts/alpine39/dependabot/Dockerfile    |  6 --
 release/lts/alpine39/docker/Dockerfile        | 95 -------------------
 release/lts/alpine39/getLatestTag.ps1         | 14 ---
 release/lts/alpine39/meta.json                | 14 ---
 .../lts/alpine39/test-deps/docker/Dockerfile  | 40 --------
 release/lts/alpine39/test-deps/meta.json      | 20 ----
 .../preview/alpine39/dependabot/Dockerfile    |  6 --
 release/preview/alpine39/docker/Dockerfile    | 91 ------------------
 release/preview/alpine39/meta.json            | 18 ----
 .../alpine39/test-deps/docker/Dockerfile      | 40 --------
 release/preview/alpine39/test-deps/meta.json  | 20 ----
 release/stable/alpine38/dependabot/Dockerfile |  1 -
 release/stable/alpine38/docker/Dockerfile     | 91 ------------------
 release/stable/alpine38/getLatestTag.ps1      | 14 ---
 release/stable/alpine38/meta.json             | 15 ---
 .../alpine38/test-deps/docker/Dockerfile      | 38 --------
 release/stable/alpine38/test-deps/meta.json   | 16 ----
 release/stable/alpine39/dependabot/Dockerfile |  6 --
 release/stable/alpine39/docker/Dockerfile     | 89 -----------------
 release/stable/alpine39/meta.json             | 18 ----
 .../alpine39/test-deps/docker/Dockerfile      | 40 --------
 release/stable/alpine39/test-deps/meta.json   | 20 ----
 23 files changed, 722 deletions(-)
 delete mode 100644 release/lts/alpine39/dependabot/Dockerfile
 delete mode 100644 release/lts/alpine39/docker/Dockerfile
 delete mode 100644 release/lts/alpine39/getLatestTag.ps1
 delete mode 100644 release/lts/alpine39/meta.json
 delete mode 100644 release/lts/alpine39/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/alpine39/test-deps/meta.json
 delete mode 100644 release/preview/alpine39/dependabot/Dockerfile
 delete mode 100644 release/preview/alpine39/docker/Dockerfile
 delete mode 100644 release/preview/alpine39/meta.json
 delete mode 100644 release/preview/alpine39/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/alpine39/test-deps/meta.json
 delete mode 100644 release/stable/alpine38/dependabot/Dockerfile
 delete mode 100644 release/stable/alpine38/docker/Dockerfile
 delete mode 100644 release/stable/alpine38/getLatestTag.ps1
 delete mode 100644 release/stable/alpine38/meta.json
 delete mode 100644 release/stable/alpine38/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/alpine38/test-deps/meta.json
 delete mode 100644 release/stable/alpine39/dependabot/Dockerfile
 delete mode 100644 release/stable/alpine39/docker/Dockerfile
 delete mode 100644 release/stable/alpine39/meta.json
 delete mode 100644 release/stable/alpine39/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/alpine39/test-deps/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7207a5277..7c2fe816a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,11 +3,6 @@ version: 2
 # update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex
 
 updates:
-  - package-ecosystem: "docker"
-    directory: "/release/preview/alpine39/dependabot"
-    schedule:
-      interval: "weekly"
-
   - package-ecosystem: "docker"
     directory: "/release/preview/alpine311/docker"
     schedule:
@@ -47,8 +42,3 @@ updates:
     directory: "/release/preview/windowsservercore/dependabot"
     schedule:
       interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/preview/alpine38/dependabot"
-    schedule:
-      interval: "weekly"
diff --git a/release/lts/alpine39/dependabot/Dockerfile b/release/lts/alpine39/dependabot/Dockerfile
deleted file mode 100644
index cf983a1b7..000000000
--- a/release/lts/alpine39/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.10.0
diff --git a/release/lts/alpine39/docker/Dockerfile b/release/lts/alpine39/docker/Dockerfile
deleted file mode 100644
index cef70ce3c..000000000
--- a/release/lts/alpine39/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
-
-# Define arg(s) needed for the From statement
-ARG fromTag=3.9
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-lts
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-ARG fromTag=3.9
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-lts
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-lts symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/getLatestTag.ps1 b/release/lts/alpine39/getLatestTag.ps1
deleted file mode 100644
index e3832bb04..000000000
--- a/release/lts/alpine39/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.9','3.10')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d\d?$' -OnlyShortTags
diff --git a/release/lts/alpine39/meta.json b/release/lts/alpine39/meta.json
deleted file mode 100644
index bf214aa39..000000000
--- a/release/lts/alpine39/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
-    "tagTemplates": [
-        "lts-alpine-#shorttag#"
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 175
-    }
-}
diff --git a/release/lts/alpine39/test-deps/docker/Dockerfile b/release/lts/alpine39/test-deps/docker/Dockerfile
deleted file mode 100644
index 1fb8267a4..000000000
--- a/release/lts/alpine39/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ARG fromTag=3.9
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/alpine39/test-deps/meta.json b/release/lts/alpine39/test-deps/meta.json
deleted file mode 100644
index 712f66eba..000000000
--- a/release/lts/alpine39/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 254
-    },
-    "TagMapping": {
-        "^.*-alpine-3.9$" : "lts-alpine-3.9",
-        "^.*-alpine-3.10$" : "lts-alpine-3.10"
-    }
-}
diff --git a/release/preview/alpine39/dependabot/Dockerfile b/release/preview/alpine39/dependabot/Dockerfile
deleted file mode 100644
index cf983a1b7..000000000
--- a/release/preview/alpine39/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.10.0
diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile
deleted file mode 100644
index 574eb5426..000000000
--- a/release/preview/alpine39/docker/Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.9 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.9
-
-ARG fromTag=3.9
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine39/meta.json b/release/preview/alpine39/meta.json
deleted file mode 100644
index 45aa28f58..000000000
--- a/release/preview/alpine39/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
-    "tagTemplates": [
-        "#psversion#-alpine-3.9-#fulltag#",
-        "preview-alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.9"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 225
-    }
-}
diff --git a/release/preview/alpine39/test-deps/docker/Dockerfile b/release/preview/alpine39/test-deps/docker/Dockerfile
deleted file mode 100644
index 1fb8267a4..000000000
--- a/release/preview/alpine39/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ARG fromTag=3.9
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine39/test-deps/meta.json b/release/preview/alpine39/test-deps/meta.json
deleted file mode 100644
index 3d4f95d93..000000000
--- a/release/preview/alpine39/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 296
-    },
-    "TagMapping": {
-        "^.*-alpine-3.9$" : "preview-alpine-3.9",
-        "^.*-alpine-3.10$" : "preview-alpine-3.10"
-    }
-}
diff --git a/release/stable/alpine38/dependabot/Dockerfile b/release/stable/alpine38/dependabot/Dockerfile
deleted file mode 100644
index e942d14d9..000000000
--- a/release/stable/alpine38/dependabot/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM node:14.3.0-alpine
diff --git a/release/stable/alpine38/docker/Dockerfile b/release/stable/alpine38/docker/Dockerfile
deleted file mode 100644
index 9544e0588..000000000
--- a/release/stable/alpine38/docker/Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.8 image with PowerShell installed from .tar.gz file(s)
-
-# Define arg(s) needed for the From statement
-ARG fromTag=3.8
-ARG imageRepo=alpine
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.8
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.0 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine38/getLatestTag.ps1 b/release/stable/alpine38/getLatestTag.ps1
deleted file mode 100644
index 1f57da10e..000000000
--- a/release/stable/alpine38/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the Alpine image on
-
-# The versions of Alpine we care about, for this dockerfile
-$shortTags = @('3.8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "alpine" -FullTagFilter '^3.\d$' -OnlyShortTags
diff --git a/release/stable/alpine38/meta.json b/release/stable/alpine38/meta.json
deleted file mode 100644
index 48b7ad716..000000000
--- a/release/stable/alpine38/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "#psversion#-alpine-#tag#",
-        "alpine-#shorttag#"
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 175
-    }
-}
diff --git a/release/stable/alpine38/test-deps/docker/Dockerfile b/release/stable/alpine38/test-deps/docker/Dockerfile
deleted file mode 100644
index 83f43feb9..000000000
--- a/release/stable/alpine38/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.8
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.8
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine38/test-deps/meta.json b/release/stable/alpine38/test-deps/meta.json
deleted file mode 100644
index 267ad884c..000000000
--- a/release/stable/alpine38/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.8",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 255
-    }
-}
diff --git a/release/stable/alpine39/dependabot/Dockerfile b/release/stable/alpine39/dependabot/Dockerfile
deleted file mode 100644
index cf983a1b7..000000000
--- a/release/stable/alpine39/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.10.0
diff --git a/release/stable/alpine39/docker/Dockerfile b/release/stable/alpine39/docker/Dockerfile
deleted file mode 100644
index 7be5eba7f..000000000
--- a/release/stable/alpine39/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.9 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.9
-
-ARG fromTag=3.9
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/meta.json b/release/stable/alpine39/meta.json
deleted file mode 100644
index 37acbbd09..000000000
--- a/release/stable/alpine39/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.9",
-    "tagTemplates": [
-        "#psversion#-alpine-3.9-#fulltag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.9"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 175
-    }
-}
diff --git a/release/stable/alpine39/test-deps/docker/Dockerfile b/release/stable/alpine39/test-deps/docker/Dockerfile
deleted file mode 100644
index 1fb8267a4..000000000
--- a/release/stable/alpine39/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ARG fromTag=3.9
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine39/test-deps/meta.json b/release/stable/alpine39/test-deps/meta.json
deleted file mode 100644
index 7809994db..000000000
--- a/release/stable/alpine39/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.9",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 255
-    },
-    "TagMapping": {
-        "^.*-alpine-3.9$" : "alpine-3.9",
-        "^.*-alpine-3.10$" : "alpine-3.10"
-    }
-}

From 431249c7ca080aaa0355ab4ad8c6bd05de75766b Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 13 Oct 2020 15:54:00 -0400
Subject: [PATCH 103/354] Changing fulltags for windowsserver preview, lts, and
 stable (#498)

---
 .../lts/windowsservercore/getLatestTag.ps1    | 19 ------
 release/lts/windowsservercore/meta.json       | 12 ----
 .../docker/Dockerfile                         |  7 +-
 release/lts/windowsservercore1809/meta.json   | 18 +++++
 .../windowsservercore1903/docker/Dockerfile   | 68 +++++++++++++++++++
 release/lts/windowsservercore1903/meta.json   | 19 ++++++
 .../windowsservercore1909/docker/Dockerfile   | 68 +++++++++++++++++++
 release/lts/windowsservercore1909/meta.json   | 19 ++++++
 .../dependabot/Dockerfile                     |  0
 .../windowsservercore2004/docker/Dockerfile   | 68 +++++++++++++++++++
 release/lts/windowsservercore2004/meta.json   | 19 ++++++
 .../windowsservercore/getLatestTag.ps1        | 20 ------
 .../docker/Dockerfile                         |  7 +-
 .../meta.json                                 | 14 +---
 .../windowsservercore1903/docker/Dockerfile   | 68 +++++++++++++++++++
 .../preview/windowsservercore1903/meta.json   | 20 ++++++
 .../windowsservercore1909/docker/Dockerfile   | 68 +++++++++++++++++++
 .../preview/windowsservercore1909/meta.json   | 20 ++++++
 .../dependabot/Dockerfile                     |  0
 .../windowsservercore2004/docker/Dockerfile   | 68 +++++++++++++++++++
 .../preview/windowsservercore2004/meta.json   | 20 ++++++
 .../stable/windowsservercore/getLatestTag.ps1 | 19 ------
 .../docker/Dockerfile                         |  7 +-
 .../meta.json                                 | 10 ++-
 .../windowsservercore1903/docker/Dockerfile   | 68 +++++++++++++++++++
 .../stable/windowsservercore1903/meta.json    | 20 ++++++
 .../windowsservercore1909/docker/Dockerfile   | 68 +++++++++++++++++++
 .../stable/windowsservercore1909/meta.json    | 20 ++++++
 .../windowsservercore2004/docker/Dockerfile   | 68 +++++++++++++++++++
 .../stable/windowsservercore2004/meta.json    | 20 ++++++
 30 files changed, 827 insertions(+), 95 deletions(-)
 delete mode 100644 release/lts/windowsservercore/getLatestTag.ps1
 delete mode 100644 release/lts/windowsservercore/meta.json
 rename release/lts/{windowsservercore => windowsservercore1809}/docker/Dockerfile (95%)
 mode change 100755 => 100644
 create mode 100644 release/lts/windowsservercore1809/meta.json
 create mode 100644 release/lts/windowsservercore1903/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore1903/meta.json
 create mode 100644 release/lts/windowsservercore1909/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore1909/meta.json
 rename release/lts/{windowsservercore => windowsservercore2004}/dependabot/Dockerfile (100%)
 create mode 100644 release/lts/windowsservercore2004/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore2004/meta.json
 delete mode 100644 release/preview/windowsservercore/getLatestTag.ps1
 rename release/preview/{windowsservercore => windowsservercore1809}/docker/Dockerfile (95%)
 mode change 100755 => 100644
 rename release/preview/{windowsservercore => windowsservercore1809}/meta.json (56%)
 create mode 100644 release/preview/windowsservercore1903/docker/Dockerfile
 create mode 100644 release/preview/windowsservercore1903/meta.json
 create mode 100644 release/preview/windowsservercore1909/docker/Dockerfile
 create mode 100644 release/preview/windowsservercore1909/meta.json
 rename release/preview/{windowsservercore => windowsservercore2004}/dependabot/Dockerfile (100%)
 create mode 100644 release/preview/windowsservercore2004/docker/Dockerfile
 create mode 100644 release/preview/windowsservercore2004/meta.json
 delete mode 100644 release/stable/windowsservercore/getLatestTag.ps1
 rename release/stable/{windowsservercore => windowsservercore1809}/docker/Dockerfile (95%)
 mode change 100755 => 100644
 rename release/stable/{windowsservercore => windowsservercore1809}/meta.json (50%)
 create mode 100644 release/stable/windowsservercore1903/docker/Dockerfile
 create mode 100644 release/stable/windowsservercore1903/meta.json
 create mode 100644 release/stable/windowsservercore1909/docker/Dockerfile
 create mode 100644 release/stable/windowsservercore1909/meta.json
 create mode 100644 release/stable/windowsservercore2004/docker/Dockerfile
 create mode 100644 release/stable/windowsservercore2004/meta.json

diff --git a/release/lts/windowsservercore/getLatestTag.ps1 b/release/lts/windowsservercore/getLatestTag.ps1
deleted file mode 100644
index 4b74754eb..000000000
--- a/release/lts/windowsservercore/getLatestTag.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-param(
-    [Switch]
-    $CI
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath -Force
-
-# The versions of nanoserver we care about
-$shortTags = @('1809', '1903', '1909', '2004')
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/lts/windowsservercore/meta.json b/release/lts/windowsservercore/meta.json
deleted file mode 100644
index d92c16abe..000000000
--- a/release/lts/windowsservercore/meta.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version ${fromTag}",
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/lts/windowsservercore/docker/Dockerfile b/release/lts/windowsservercore1809/docker/Dockerfile
old mode 100755
new mode 100644
similarity index 95%
rename from release/lts/windowsservercore/docker/Dockerfile
rename to release/lts/windowsservercore1809/docker/Dockerfile
index 09c4df65f..bc7d5a764
--- a/release/lts/windowsservercore/docker/Dockerfile
+++ b/release/lts/windowsservercore1809/docker/Dockerfile
@@ -1,10 +1,9 @@
 # escape=`
-ARG fromTag=latest
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
+FROM ${WindowsServerCoreRepo}:1809 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -31,7 +30,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:${fromTag}
+FROM ${WindowsServerCoreRepo}:1809
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
@@ -40,7 +39,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
     POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
diff --git a/release/lts/windowsservercore1809/meta.json b/release/lts/windowsservercore1809/meta.json
new file mode 100644
index 000000000..7c86a28c5
--- /dev/null
+++ b/release/lts/windowsservercore1809/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1809",
+    "shortTags": [
+        {
+            "Tag": "1809"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-1809-#fulltag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    }
+}
diff --git a/release/lts/windowsservercore1903/docker/Dockerfile b/release/lts/windowsservercore1903/docker/Dockerfile
new file mode 100644
index 000000000..789245f0d
--- /dev/null
+++ b/release/lts/windowsservercore1903/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1903 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1903
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore1903/meta.json b/release/lts/windowsservercore1903/meta.json
new file mode 100644
index 000000000..7047f3cc3
--- /dev/null
+++ b/release/lts/windowsservercore1903/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-1903-#fulltag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/lts/windowsservercore1909/docker/Dockerfile b/release/lts/windowsservercore1909/docker/Dockerfile
new file mode 100644
index 000000000..ba029d812
--- /dev/null
+++ b/release/lts/windowsservercore1909/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1909 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore1909/meta.json b/release/lts/windowsservercore1909/meta.json
new file mode 100644
index 000000000..7ac2a1f7d
--- /dev/null
+++ b/release/lts/windowsservercore1909/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-1909-#fulltag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/lts/windowsservercore/dependabot/Dockerfile b/release/lts/windowsservercore2004/dependabot/Dockerfile
similarity index 100%
rename from release/lts/windowsservercore/dependabot/Dockerfile
rename to release/lts/windowsservercore2004/dependabot/Dockerfile
diff --git a/release/lts/windowsservercore2004/docker/Dockerfile b/release/lts/windowsservercore2004/docker/Dockerfile
new file mode 100644
index 000000000..c4407ca50
--- /dev/null
+++ b/release/lts/windowsservercore2004/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:2004 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore2004/meta.json b/release/lts/windowsservercore2004/meta.json
new file mode 100644
index 000000000..060f07492
--- /dev/null
+++ b/release/lts/windowsservercore2004/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-2004-#fulltag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
deleted file mode 100644
index 95e69a806..000000000
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore1809/docker/Dockerfile
old mode 100755
new mode 100644
similarity index 95%
rename from release/preview/windowsservercore/docker/Dockerfile
rename to release/preview/windowsservercore1809/docker/Dockerfile
index 30c115776..4820bacde
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore1809/docker/Dockerfile
@@ -1,10 +1,9 @@
 # escape=`
-ARG fromTag=latest
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
+FROM ${WindowsServerCoreRepo}:1809 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -31,7 +30,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:${fromTag}
+FROM ${WindowsServerCoreRepo}:1809
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
@@ -40,7 +39,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
     POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
diff --git a/release/preview/windowsservercore/meta.json b/release/preview/windowsservercore1809/meta.json
similarity index 56%
rename from release/preview/windowsservercore/meta.json
rename to release/preview/windowsservercore1809/meta.json
index 8a48a0afc..24424e59c 100644
--- a/release/preview/windowsservercore/meta.json
+++ b/release/preview/windowsservercore1809/meta.json
@@ -1,24 +1,16 @@
 {
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version ${fromTag}",
+    "osVersion": "Windows Server Core, version 1809",
     "shortTags": [
         {
             "Tag": "1809"
-        },
-        {
-            "Tag": "1903"
-        },
-        {
-            "Tag": "1909"
-        },
-        {
-            "Tag": "2004"
         }
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#tag#",
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1809-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/preview/windowsservercore1903/docker/Dockerfile b/release/preview/windowsservercore1903/docker/Dockerfile
new file mode 100644
index 000000000..bd70196f8
--- /dev/null
+++ b/release/preview/windowsservercore1903/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1903 AS installer-env
+
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1903
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore1903/meta.json b/release/preview/windowsservercore1903/meta.json
new file mode 100644
index 000000000..cb6e97ffb
--- /dev/null
+++ b/release/preview/windowsservercore1903/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1903-#fulltag#",
+        "preview-windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/windowsservercore1909/docker/Dockerfile b/release/preview/windowsservercore1909/docker/Dockerfile
new file mode 100644
index 000000000..f2b4c7b2d
--- /dev/null
+++ b/release/preview/windowsservercore1909/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1909 AS installer-env
+
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore1909/meta.json b/release/preview/windowsservercore1909/meta.json
new file mode 100644
index 000000000..3816987c3
--- /dev/null
+++ b/release/preview/windowsservercore1909/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1909-#fulltag#",
+        "preview-windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/windowsservercore/dependabot/Dockerfile b/release/preview/windowsservercore2004/dependabot/Dockerfile
similarity index 100%
rename from release/preview/windowsservercore/dependabot/Dockerfile
rename to release/preview/windowsservercore2004/dependabot/Dockerfile
diff --git a/release/preview/windowsservercore2004/docker/Dockerfile b/release/preview/windowsservercore2004/docker/Dockerfile
new file mode 100644
index 000000000..fc7caa4c7
--- /dev/null
+++ b/release/preview/windowsservercore2004/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:2004 AS installer-env
+
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore2004/meta.json b/release/preview/windowsservercore2004/meta.json
new file mode 100644
index 000000000..3480b2b4f
--- /dev/null
+++ b/release/preview/windowsservercore2004/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-2004-#fulltag#",
+        "preview-windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
deleted file mode 100644
index 4b74754eb..000000000
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-param(
-    [Switch]
-    $CI
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath -Force
-
-# The versions of nanoserver we care about
-$shortTags = @('1809', '1903', '1909', '2004')
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore1809/docker/Dockerfile
old mode 100755
new mode 100644
similarity index 95%
rename from release/stable/windowsservercore/docker/Dockerfile
rename to release/stable/windowsservercore1809/docker/Dockerfile
index 007e1a4a3..19e75a08a
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore1809/docker/Dockerfile
@@ -1,10 +1,9 @@
 # escape=`
-ARG fromTag=latest
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
+FROM ${WindowsServerCoreRepo}:1809 AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -31,7 +30,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:${fromTag}
+FROM ${WindowsServerCoreRepo}:1809
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
@@ -40,7 +39,7 @@ ENV ProgramFiles="C:\Program Files" `
     PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-${fromTag}" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
     POWERSHELL_TELEMETRY_OPTOUT="1"
 
 # Copy PowerShell Core from the installer container
diff --git a/release/stable/windowsservercore/meta.json b/release/stable/windowsservercore1809/meta.json
similarity index 50%
rename from release/stable/windowsservercore/meta.json
rename to release/stable/windowsservercore1809/meta.json
index 042e3ff9e..8daea2fb2 100644
--- a/release/stable/windowsservercore/meta.json
+++ b/release/stable/windowsservercore1809/meta.json
@@ -1,10 +1,16 @@
 {
     "IsLinux": false,
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version ${fromTag}",
+    "osVersion": "Windows Server Core, version 1809",
+    "shortTags": [
+        {
+            "Tag": "1809"
+        }
+    ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#tag#",
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1809-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/stable/windowsservercore1903/docker/Dockerfile b/release/stable/windowsservercore1903/docker/Dockerfile
new file mode 100644
index 000000000..94d333dba
--- /dev/null
+++ b/release/stable/windowsservercore1903/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1903 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1903
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore1903/meta.json b/release/stable/windowsservercore1903/meta.json
new file mode 100644
index 000000000..60c239653
--- /dev/null
+++ b/release/stable/windowsservercore1903/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1903",
+    "shortTags": [
+        {
+            "Tag": "1903"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1903-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/windowsservercore1909/docker/Dockerfile b/release/stable/windowsservercore1909/docker/Dockerfile
new file mode 100644
index 000000000..78617c342
--- /dev/null
+++ b/release/stable/windowsservercore1909/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1909 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore1909/meta.json b/release/stable/windowsservercore1909/meta.json
new file mode 100644
index 000000000..5e27182bd
--- /dev/null
+++ b/release/stable/windowsservercore1909/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1909-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/windowsservercore2004/docker/Dockerfile b/release/stable/windowsservercore2004/docker/Dockerfile
new file mode 100644
index 000000000..fda450553
--- /dev/null
+++ b/release/stable/windowsservercore2004/docker/Dockerfile
@@ -0,0 +1,68 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:2004 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
+    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore2004/meta.json b/release/stable/windowsservercore2004/meta.json
new file mode 100644
index 000000000..d6ff9a9d3
--- /dev/null
+++ b/release/stable/windowsservercore2004/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-2004-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}

From 4a4f6a611b4127f348963d44c436808658436432 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 14 Oct 2020 14:25:14 -0700
Subject: [PATCH 104/354] Fix release test failures (#499)

---
 .vsts-ci/releasePipeline.yml                  |  4 +-
 .../templatesReleasePipeline/releaseStage.yml |  2 +-
 build.ps1                                     |  4 +-
 tests/container.tests.ps1                     | 59 +++++++++++++++----
 tests/containerTestCommon.psm1                |  3 +-
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
index cb1205003..9eabe6c3d 100644
--- a/.vsts-ci/releasePipeline.yml
+++ b/.vsts-ci/releasePipeline.yml
@@ -29,7 +29,7 @@ stages:
     channel: "lts"
 
 - stage: Approve_Release
-  condition: always()
+  condition: succeeded()
   dependsOn: ['test_preview','test_stable','test_lts']
   displayName: Approve Release
   jobs:
@@ -39,7 +39,7 @@ stages:
     environment: PSDockerMcrRelease
 
 - stage: Create_PR
-  condition: always()
+  condition: succeeded()
   dependsOn: ['Release_preview','Release_stable','Release_lts']
   displayName: Create McrDocs Pr
   jobs:
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index f2ebfddde..d56aeba5a 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -12,7 +12,7 @@ parameters:
 
 stages:
     - stage: Release_${{ parameters.channel }}
-      condition: always()
+      condition: succeeded()
       dependsOn: ['Approve_Release']
       displayName: Release ${{ parameters.channel }}
       jobs:
diff --git a/build.ps1 b/build.ps1
index 548e43cc3..06979a3c6 100755
--- a/build.ps1
+++ b/build.ps1
@@ -483,9 +483,9 @@ End {
 
         Write-Verbose -Message "logging to $logPath" -Verbose
         $results = Invoke-Pester -Script $testsPath -OutputFile $logPath -PassThru -OutputFormat NUnitXml @extraParams
-        if(!$results -or $results.FailedCount -gt 0 -or !$results.PassedCount)
+        if(!$results -or $results.FailedCount -gt 0 -or !$results.TotalCount)
         {
-            throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount)"
+            throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount) Total: $($results.TotalCount)"
         }
     }
 
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 6a60dcbf9..0634106be 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -1,5 +1,6 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
 Set-StrictMode -Off
 
 Import-module -Name "$PSScriptRoot\containerTestCommon.psm1" -Force
@@ -131,11 +132,13 @@ Describe "Pull Windows Containers" -Tags 'Windows', 'Pull' {
         $pullTestCases = @()
         $script:windowsContainerRunTests | ForEach-Object {
             $pullTestCases += @{
-                Name = $_.Name
-                Tags = $_.Tags
+                Name   = $_.Name
+                Tags   = $_.Tags
+                UseAcr = [bool]$_.UseAcr
             }
         }
     }
+
     it "<Name> pulls without error" -TestCases $pullTestCases  -skip:$script:skipWindowsRun {
         param(
             [Parameter(Mandatory=$true)]
@@ -144,9 +147,16 @@ Describe "Pull Windows Containers" -Tags 'Windows', 'Pull' {
 
             [Parameter(Mandatory=$true)]
             [string[]]
-            $Tags
+            $Tags,
+
+            [Bool]
+            $UseAcr
         )
 
+        if ($UseAcr) {
+            Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+        }
+
         foreach($tag in $tags) {
             Invoke-Docker -Command pull -Params @(
                     ${tag}
@@ -215,8 +225,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 $Arm32
             )
 
-            if($Arm32)
-            {
+            if ($Arm32) {
                 Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
             }
 
@@ -610,6 +619,7 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
                 Name = $_.Name
                 ExpectedVersion = $_.ExpectedVersion
                 Channel = $_.Channel
+                UseAcr = [bool]$_.UseAcr
             }
         }
 
@@ -617,6 +627,7 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
         $script:windowsContainerRunTests | Where-Object {$_.SkipWebCmdletTests -ne $true} | ForEach-Object {
             $webTestCases += @{
                 Name = $_.Name
+                UseAcr = [bool]$_.UseAcr
             }
         }
     }
@@ -638,9 +649,16 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
 
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $UseAcr
             )
 
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
             Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name | should -be $ExpectedVersion
         }
 
@@ -648,9 +666,16 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
-                $name
+                $name,
+
+                [Bool]
+                $UseAcr
             )
 
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
             $metadataString = Get-MetadataUsingContainer -Name $Name
             $metadataString | Should -Not -BeNullOrEmpty
             $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
@@ -661,9 +686,16 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]
-                $name
+                $name,
+
+                [Bool]
+                $UseAcr
             )
 
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
             $path = Get-ContainerPath -Name $Name
 
             #TODO: Run the base image and make sure the path is included
@@ -683,9 +715,16 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
 
                 [Parameter(Mandatory=$true)]
                 [string]
-                $Channel
+                $Channel,
+
+                [Bool]
+                $UseAcr
             )
 
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
             if ($Channel -ne 'preview') {
                 Set-ItResult -Skipped -Because "Test is not applicable to $Channel"
             }
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index f1ecfa202..d310ee4b2 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Get Docker Engine OS
@@ -180,6 +180,7 @@ function Get-WindowsContainer
                 OptionalTests = $testArgs.OptionalTests
                 TestProperties = $testArgs.TestProperties
                 Channel = $testArgs.Channel
+                UseAcr = $testArgs.UseAcr
             }
         }
     }

From afcfed2a5e7c3785509124eb901093383ef7b0ac Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 15 Oct 2020 15:11:07 -0700
Subject: [PATCH 105/354] Fix OSVersion issues (#502)

---
 release/lts/fedora/dependabot/Dockerfile      |  6 --
 release/lts/fedora/docker/Dockerfile          | 94 ------------------
 release/lts/fedora/getLatestTag.ps1           | 14 ---
 release/lts/fedora/meta.json                  | 14 ---
 release/lts/fedora/test-deps/meta.json        | 19 ----
 release/preview/alpine310/meta.json           |  5 +-
 release/preview/alpine310/test-deps/meta.json |  2 +-
 .../fedora/test-deps/docker/Dockerfile        | 22 -----
 .../{fedora => fedora31}/docker/Dockerfile    |  0
 .../preview/{fedora => fedora31}/meta.json    |  0
 .../fedora31}/test-deps/docker/Dockerfile     |  0
 .../{fedora => fedora31}/test-deps/meta.json  |  0
 release/stable/fedora/dependabot/Dockerfile   |  6 --
 release/stable/fedora/docker/Dockerfile       | 95 -------------------
 release/stable/fedora/getLatestTag.ps1        | 14 ---
 release/stable/fedora/meta.json               | 15 ---
 .../stable/fedora/test-deps/docker/Dockerfile | 22 -----
 release/stable/fedora/test-deps/meta.json     | 19 ----
 18 files changed, 4 insertions(+), 343 deletions(-)
 delete mode 100644 release/lts/fedora/dependabot/Dockerfile
 delete mode 100644 release/lts/fedora/docker/Dockerfile
 delete mode 100644 release/lts/fedora/getLatestTag.ps1
 delete mode 100644 release/lts/fedora/meta.json
 delete mode 100644 release/lts/fedora/test-deps/meta.json
 delete mode 100644 release/preview/fedora/test-deps/docker/Dockerfile
 rename release/preview/{fedora => fedora31}/docker/Dockerfile (100%)
 rename release/preview/{fedora => fedora31}/meta.json (100%)
 rename release/{lts/fedora => preview/fedora31}/test-deps/docker/Dockerfile (100%)
 rename release/preview/{fedora => fedora31}/test-deps/meta.json (100%)
 delete mode 100644 release/stable/fedora/dependabot/Dockerfile
 delete mode 100644 release/stable/fedora/docker/Dockerfile
 delete mode 100644 release/stable/fedora/getLatestTag.ps1
 delete mode 100644 release/stable/fedora/meta.json
 delete mode 100644 release/stable/fedora/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/fedora/test-deps/meta.json

diff --git a/release/lts/fedora/dependabot/Dockerfile b/release/lts/fedora/dependabot/Dockerfile
deleted file mode 100644
index 78061c9c0..000000000
--- a/release/lts/fedora/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM fedora:30
diff --git a/release/lts/fedora/docker/Dockerfile b/release/lts/fedora/docker/Dockerfile
deleted file mode 100644
index d953530a6..000000000
--- a/release/lts/fedora/docker/Dockerfile
+++ /dev/null
@@ -1,94 +0,0 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-ARG fromTag=28
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && echo "starting misc packages" \
-    && dnf install -y \
-    # less is needed for help
-      less \
-    # Needed to run localdef
-      glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-      compat-openssl10 \
-      ca-certificates \
-      gssntlmssp \
-    # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && echo "end - misc packages" \
-    && echo "starting FEDORA-2019-27e7b92407" \
-    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
-    # to do this, upgrade libmodulemd1, if it is installed
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          try { \$packageList = dnf list installed libmodulemd1} \
-          catch {}; \
-          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
-          if(\$module) { \
-            Write-Host '******* Patching *********'; \
-            dnf upgrade -y libmodulemd1 \
-          }" \
-    && echo "end - FEDORA-2019-27e7b92407" \
-    # This installs most security advisories
-    && echo "starting upgrade minimal" \
-    && dnf upgrade-minimal -y --security \
-    && echo "end - upgrade minimal" \
-    # query and install any remaining security advisories
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          Write-Host '******* Getting security advisory list *********'; \
-          (dnf updateinfo list -q --security) |  \
-              Foreach-Object { \
-                  \$advisory=(\$_ -split ' ')[0]; \
-                  Write-Host '******* Patching *********'; \
-                  Write-Host \$advisory; \
-                  Write-Host '************************'; \
-                  dnf upgrade -y --advisory=\$advisory \
-              }" \
-    && echo "verifying all security advisories are installed..." \
-    && dnf updateinfo list -q --security \
-    && echo "end - verifying all security advisories are installed..." \
-    && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/fedora/getLatestTag.ps1 b/release/lts/fedora/getLatestTag.ps1
deleted file mode 100644
index 11d8fada4..000000000
--- a/release/lts/fedora/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the fedora image on
-
-# The versions of fedora we care about
-$shortTags = @('30')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/lts/fedora/meta.json b/release/lts/fedora/meta.json
deleted file mode 100644
index 2daa43419..000000000
--- a/release/lts/fedora/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "lts-fedora-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/lts/fedora/test-deps/meta.json b/release/lts/fedora/test-deps/meta.json
deleted file mode 100644
index 3a070f03e..000000000
--- a/release/lts/fedora/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Fedora ${fromTag}",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 632
-    },
-    "TagMapping": {
-        "^.*-fedora-30$" : "lts-fedora-30"
-    }
-}
diff --git a/release/preview/alpine310/meta.json b/release/preview/alpine310/meta.json
index 27ea77f58..d5ae751bf 100644
--- a/release/preview/alpine310/meta.json
+++ b/release/preview/alpine310/meta.json
@@ -2,9 +2,10 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine",
+    "osVersion": "Alpine 3.10",
     "tagTemplates": [
-        "#psversion#-alpine-3.10-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
+        "#psversion#-alpine-#shorttag#-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/alpine310/test-deps/meta.json b/release/preview/alpine310/test-deps/meta.json
index 3d4f95d93..0ec28911a 100644
--- a/release/preview/alpine310/test-deps/meta.json
+++ b/release/preview/alpine310/test-deps/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine ${fromTag}",
+    "osVersion": "Alpine 3.10",
     "tagTemplates": [
         "#tag#"
     ],
diff --git a/release/preview/fedora/test-deps/docker/Dockerfile b/release/preview/fedora/test-deps/docker/Dockerfile
deleted file mode 100644
index 656afd0ff..000000000
--- a/release/preview/fedora/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Fedora 28 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
-
-FROM ${BaseImage}
-
-ARG fromTag=28
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        findutils \
-        hostname \
-        iputils \
-        wget \
-        procps-ng \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora31/docker/Dockerfile
similarity index 100%
rename from release/preview/fedora/docker/Dockerfile
rename to release/preview/fedora31/docker/Dockerfile
diff --git a/release/preview/fedora/meta.json b/release/preview/fedora31/meta.json
similarity index 100%
rename from release/preview/fedora/meta.json
rename to release/preview/fedora31/meta.json
diff --git a/release/lts/fedora/test-deps/docker/Dockerfile b/release/preview/fedora31/test-deps/docker/Dockerfile
similarity index 100%
rename from release/lts/fedora/test-deps/docker/Dockerfile
rename to release/preview/fedora31/test-deps/docker/Dockerfile
diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora31/test-deps/meta.json
similarity index 100%
rename from release/preview/fedora/test-deps/meta.json
rename to release/preview/fedora31/test-deps/meta.json
diff --git a/release/stable/fedora/dependabot/Dockerfile b/release/stable/fedora/dependabot/Dockerfile
deleted file mode 100644
index 78061c9c0..000000000
--- a/release/stable/fedora/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM fedora:30
diff --git a/release/stable/fedora/docker/Dockerfile b/release/stable/fedora/docker/Dockerfile
deleted file mode 100644
index 72732d6e9..000000000
--- a/release/stable/fedora/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-ARG fromTag=28
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && echo "starting misc packages" \
-    && dnf install -y \
-    # less is needed for help
-      less \
-    # Needed to run localdef
-      glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-      compat-openssl10 \
-      ca-certificates \
-      gssntlmssp \
-    # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && echo "end - misc packages" \
-    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
-    && echo "starting FEDORA-2019-27e7b92407" \
-    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
-    # to do this, upgrade libmodulemd1, if it is installed
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          try { \$packageList = dnf list installed libmodulemd1} \
-          catch {}; \
-          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
-          if(\$module) { \
-            Write-Host '******* Patching *********'; \
-            dnf upgrade -y libmodulemd1 \
-          }" \
-    && echo "end - FEDORA-2019-27e7b92407" \
-    # This installs most security advisories
-    && echo "starting upgrade minimal" \
-    && dnf upgrade-minimal -y --security \
-    && echo "end - upgrade minimal" \
-    # query and install any remaining security advisories
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          Write-Host '******* Getting security advisory list *********'; \
-          (dnf updateinfo list -q --security) |  \
-              Foreach-Object { \
-                  \$advisory=(\$_ -split ' ')[0]; \
-                  Write-Host '******* Patching *********'; \
-                  Write-Host \$advisory; \
-                  Write-Host '************************'; \
-                  dnf upgrade -y --advisory=\$advisory \
-              }" \
-    && echo "verifying all security advisories are installed..." \
-    && dnf updateinfo list -q --security \
-    && echo "end - verifying all security advisories are installed..." \
-    && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/fedora/getLatestTag.ps1 b/release/stable/fedora/getLatestTag.ps1
deleted file mode 100644
index 11d8fada4..000000000
--- a/release/stable/fedora/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the fedora image on
-
-# The versions of fedora we care about
-$shortTags = @('30')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/stable/fedora/meta.json b/release/stable/fedora/meta.json
deleted file mode 100644
index 19da911bd..000000000
--- a/release/stable/fedora/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-fedora-#tag#",
-        "fedora-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/stable/fedora/test-deps/docker/Dockerfile b/release/stable/fedora/test-deps/docker/Dockerfile
deleted file mode 100644
index 656afd0ff..000000000
--- a/release/stable/fedora/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Fedora 28 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
-
-FROM ${BaseImage}
-
-ARG fromTag=28
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        findutils \
-        hostname \
-        iputils \
-        wget \
-        procps-ng \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/fedora/test-deps/meta.json b/release/stable/fedora/test-deps/meta.json
deleted file mode 100644
index 494e2ba0b..000000000
--- a/release/stable/fedora/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Fedora ${fromTag}",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 632
-    },
-    "TagMapping": {
-        ".*" : "fedora-30"
-    }
-}

From 32f82273f2cd0f9dfd7bc031951cb9f53f642df8 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 19 Oct 2020 09:47:47 -0700
Subject: [PATCH 106/354] Add anamnavi to codeowners (#504)

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4ce53b340..20d24af26 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,5 +2,5 @@
 
 # Areas are not limited to the filters defined in this file
 
-**/* @anmenaga @TravisEz13
-docs/* @RDIL
+**/* @anamnavi @TravisEz13
+docs/* @RDIL @TravisEz13

From 913def601fa2f0a77f498393f64c923250cd6568 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 19 Oct 2020 09:52:39 -0700
Subject: [PATCH 107/354] remove usage of `fromtag` (#503)

---
 .../amazonlinux/test-deps/docker/Dockerfile                 | 6 ++----
 release/community-stable/kalilinux/docker/Dockerfile        | 4 ++--
 release/preview/alpine310/docker/Dockerfile                 | 5 +----
 release/preview/alpine310/test-deps/docker/Dockerfile       | 4 +---
 release/preview/alpine311/test-deps/docker/Dockerfile       | 4 +---
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
index 308a09080..3dbc2a077 100644
--- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Amazon Linux image with PowerShell
@@ -9,8 +9,6 @@ ARG BaseImage=pshorg/powershellcommunity:amazonlinux-2.0
 
 FROM ${BaseImage}
 
-ARG fromTag=2.0.20181010
-
 # Installation
 RUN \
     # install dependencies
@@ -30,6 +28,6 @@ RUN \
     # remove cache folders and files
     && rm -rf /var/cache/yum
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux-${fromTag}
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux
 
 CMD [ "pwsh" ]
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile
index 7ff41dc26..25ba4ad80 100644
--- a/release/community-stable/kalilinux/docker/Dockerfile
+++ b/release/community-stable/kalilinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Kali Rolling image with PowerShell
@@ -26,7 +26,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # Invoke-WebRequest : Authentication failed" issue when executing using
     # docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-KaliLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-KaliLinux
 
 # Installation
 RUN \
diff --git a/release/preview/alpine310/docker/Dockerfile b/release/preview/alpine310/docker/Dockerfile
index e0f517bc7..cc54eef78 100644
--- a/release/preview/alpine310/docker/Dockerfile
+++ b/release/preview/alpine310/docker/Dockerfile
@@ -26,8 +26,6 @@ RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM alpine:3.10
 
-ARG fromTag=3.10
-
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
@@ -41,8 +39,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
-
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.10
 # Install dotnet dependencies and ca-certificates
 RUN apk add --no-cache \
     ca-certificates \
diff --git a/release/preview/alpine310/test-deps/docker/Dockerfile b/release/preview/alpine310/test-deps/docker/Dockerfile
index 1fb8267a4..3e3fd4ece 100644
--- a/release/preview/alpine310/test-deps/docker/Dockerfile
+++ b/release/preview/alpine310/test-deps/docker/Dockerfile
@@ -8,12 +8,10 @@ FROM node:14.3.0-alpine as node
 
 FROM ${BaseImage}
 
-ARG fromTag=3.9
-
 ENV NODE_VERSION=14.3.0 \
     YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.9
 
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
index af97ac304..85d48d3af 100644
--- a/release/preview/alpine311/test-deps/docker/Dockerfile
+++ b/release/preview/alpine311/test-deps/docker/Dockerfile
@@ -8,12 +8,10 @@ FROM node:14.3.0-alpine as node
 
 FROM ${BaseImage}
 
-ARG fromTag=3.11
-
 ENV NODE_VERSION=14.3.0 \
     YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
 
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1

From 2cbd163e2e6d9536807e6aaa2f16fdc76d7d23f3 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Mon, 19 Oct 2020 15:03:56 -0400
Subject: [PATCH 108/354] Fedora 32 (#494)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/stable/fedora32/docker/Dockerfile | 60 +++++++++++++++++++++++
 release/stable/fedora32/meta.json         | 15 ++++++
 2 files changed, 75 insertions(+)
 create mode 100644 release/stable/fedora32/docker/Dockerfile
 create mode 100644 release/stable/fedora32/meta.json

diff --git a/release/stable/fedora32/docker/Dockerfile b/release/stable/fedora32/docker/Dockerfile
new file mode 100644
index 000000000..ef84edaca
--- /dev/null
+++ b/release/stable/fedora32/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
+ARG imageRepo=fedora
+
+FROM ${imageRepo}:32 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && dnf install -y /tmp/powershell.rpm \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && echo "starting misc packages" \
+    && dnf install -y \
+    # less is needed for help
+      less \
+    # Needed to run localdef
+      glibc-locale-source \
+    # Invoke-WebRequest doesn't work correctly without this
+      compat-openssl10 \
+      ca-certificates \
+      gssntlmssp \
+    && echo "end - misc packages" \
+    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
+    # This installs most security advisories
+    && echo "starting upgrade minimal" \
+    && dnf upgrade-minimal -y --security \
+    && echo "end - upgrade minimal" \
+    && echo "verifying all security advisories are installed..." \
+    && dnf updateinfo list -q --security \
+    && echo "end - verifying all security advisories are installed..." \
+    && dnf clean all \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/fedora32/meta.json b/release/stable/fedora32/meta.json
new file mode 100644
index 000000000..d48abd0af
--- /dev/null
+++ b/release/stable/fedora32/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "Fedora 32",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-fedora-32-#fulltag#",
+        "#psversion#-fedora-32",
+        "fedora-32-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 632
+    }
+}

From 4f78ba067da19ef0b661385085ecb1dad33b223c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 21 Oct 2020 10:46:46 -0700
Subject: [PATCH 109/354] create `pwsh-preview` symlink (#505)

---
 release/preview/ubuntu20.04/docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index 13d403367..70f33c799 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -72,6 +72,8 @@ RUN apt-get update \
 RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
     # intialize powershell module cache
     # and disable telemetry
     && export POWERSHELL_TELEMETRY_OPTOUT=1 \

From a4230cf8ddd6326e014f5bf75c04f7891157429f Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sat, 24 Oct 2020 00:44:04 +0800
Subject: [PATCH 110/354] Fix OracleLinux image: Missing latest tag from
 official Oracle Linux repository (#508)

---
 .../oraclelinux/docker/Dockerfile                           | 6 +++---
 .../{unstable => community-stable}/oraclelinux/meta.json    | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename release/{unstable => community-stable}/oraclelinux/docker/Dockerfile (94%)
 rename release/{unstable => community-stable}/oraclelinux/meta.json (100%)

diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
similarity index 94%
rename from release/unstable/oraclelinux/docker/Dockerfile
rename to release/community-stable/oraclelinux/docker/Dockerfile
index 08475a04f..27a638648 100644
--- a/release/unstable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -5,7 +5,7 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-FROM oraclelinux:latest AS installer-env
+FROM oraclelinux:8.2 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
@@ -22,7 +22,7 @@ ENV \
     LANG=en_US.UTF-8 \
     # Set up PowerShell module analysis cache path
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache  \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-latest
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-8.2
 
 # Installation
 RUN \
@@ -35,7 +35,7 @@ RUN \
       # required for SSH
       openssh-clients \
       # install EPEL repository
-	    oracle-epel-release-el7 \
+	    oracle-epel-release-el8 \
     # update package list from EPEL repository
     && yum update \
     # install dependencies from EPEL repository
diff --git a/release/unstable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
similarity index 100%
rename from release/unstable/oraclelinux/meta.json
rename to release/community-stable/oraclelinux/meta.json

From 6e1b6a37b76ef1beaaa73b287b2c26586af4155b Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sat, 24 Oct 2020 00:44:57 +0800
Subject: [PATCH 111/354] Fix ArchLinux image: Dockerfile COPY failed with no
 such file or directory for gss-ntlmssp package file (#506)

---
 .../archlinux/docker/Dockerfile                          | 9 ++++++---
 .../{unstable => community-stable}/archlinux/meta.json   | 0
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename release/{unstable => community-stable}/archlinux/docker/Dockerfile (91%)
 rename release/{unstable => community-stable}/archlinux/meta.json (100%)

diff --git a/release/unstable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile
similarity index 91%
rename from release/unstable/archlinux/docker/Dockerfile
rename to release/community-stable/archlinux/docker/Dockerfile
index e7169c640..cf1f5ed37 100644
--- a/release/unstable/archlinux/docker/Dockerfile
+++ b/release/community-stable/archlinux/docker/Dockerfile
@@ -36,13 +36,16 @@ RUN \
     # change current path to gss-ntlmssp package repository folder path
     && cd gss-ntlmssp \
     # utilise sudo to builduser in order to make the gss-ntlmssp package
-    && sudo -u builduser bash -c makepkg -s --noconfirm
+    && sudo -u builduser bash -c makepkg -s --noconfirm \
+    # rename gss-ntlmssp current version and platform architecture package
+    # filename to a generic package filename
+    && mv gss-ntlmssp-*-x86_64.pkg.tar.zst gss-ntlmssp.pkg.tar.zst
 
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
-COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"]
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp.pkg.tar.zst", "/tmp/gss-ntlmssp.pkg.tar.zst"]
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
@@ -83,7 +86,7 @@ RUN \
       # required for SSH
       openssh \
     # install gss-ntlmssp package from the previous stage
-    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \
+    && pacman -U --noconfirm /tmp/gss-ntlmssp.pkg.tar.zst \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # download the powershell linux compressed package
diff --git a/release/unstable/archlinux/meta.json b/release/community-stable/archlinux/meta.json
similarity index 100%
rename from release/unstable/archlinux/meta.json
rename to release/community-stable/archlinux/meta.json

From eeac715f2aaa65f2dd99c3161f210c33a21f9ea6 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Sat, 24 Oct 2020 00:45:51 +0800
Subject: [PATCH 112/354] Fix BlackArch image: Dockerfile COPY failed with no
 such file or directory for gss-ntlmssp package file (#507)

---
 .../blackarch/docker/Dockerfile                          | 9 ++++++---
 .../{unstable => community-stable}/blackarch/meta.json   | 0
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename release/{unstable => community-stable}/blackarch/docker/Dockerfile (92%)
 rename release/{unstable => community-stable}/blackarch/meta.json (100%)

diff --git a/release/unstable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile
similarity index 92%
rename from release/unstable/blackarch/docker/Dockerfile
rename to release/community-stable/blackarch/docker/Dockerfile
index 21ac0c626..9af9cbe1a 100644
--- a/release/unstable/blackarch/docker/Dockerfile
+++ b/release/community-stable/blackarch/docker/Dockerfile
@@ -37,13 +37,16 @@ RUN \
     # change current path to gss-ntlmssp package repository folder path
     && cd gss-ntlmssp \
     # utilise sudo to builduser in order to make the gss-ntlmssp package
-    && sudo -u builduser bash -c makepkg -s --noconfirm
+    && sudo -u builduser bash -c makepkg -s --noconfirm \
+    # rename gss-ntlmssp current version and platform architecture package
+    # filename to a generic package filename
+    && mv gss-ntlmssp-*-x86_64.pkg.tar.zst gss-ntlmssp.pkg.tar.zst
 
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM archlinux:latest
 
 # Copy only the files we need from the previous stage
-COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"]
+COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp.pkg.tar.zst", "/tmp/gss-ntlmssp.pkg.tar.zst"]
 
 # Define Args for the needed for BlackArch Linux
 ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh
@@ -98,7 +101,7 @@ RUN \
       # required for SSH
       openssh \
     # install gss-ntlmssp package from the previous stage
-    && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \
+    && pacman -U --noconfirm /tmp/gss-ntlmssp.pkg.tar.zst \
     # create powershell folder
     && mkdir -p ${PS_INSTALL_FOLDER} \
     # download the powershell linux compressed package
diff --git a/release/unstable/blackarch/meta.json b/release/community-stable/blackarch/meta.json
similarity index 100%
rename from release/unstable/blackarch/meta.json
rename to release/community-stable/blackarch/meta.json

From 461825c7ff671e13294d50d2cea0e4f1ac071017 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 27 Oct 2020 16:10:24 -0400
Subject: [PATCH 113/354] change the environment for the release pipeline
 create MCR docs stage (#513)

---
 .vsts-ci/releasePipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
index 9eabe6c3d..394fcd39a 100644
--- a/.vsts-ci/releasePipeline.yml
+++ b/.vsts-ci/releasePipeline.yml
@@ -46,4 +46,4 @@ stages:
   - deployment: ReleaseAutomationKickOff
     displayName: Create McrDocs Pr
     pool: server
-    environment: PSDockerMcrRelease
+    environment: PSDockerMcrDocs

From 80312673876a39d3acdebf1ad202d6d29ad89bad Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 27 Oct 2020 17:11:54 -0400
Subject: [PATCH 114/354] Remove debian fulltags (#512)

---
 release/lts/debian10/docker/Dockerfile     |  5 ++---
 release/lts/debian10/getLatestTag.ps1      | 14 --------------
 release/lts/debian10/meta.json             |  6 +++++-
 release/lts/debian9/docker/Dockerfile      |  3 +--
 release/lts/debian9/getLatestTag.ps1       | 14 --------------
 release/lts/debian9/meta.json              |  5 +++++
 release/preview/debian10/docker/Dockerfile |  5 ++---
 release/preview/debian10/getLatestTag.ps1  | 14 --------------
 release/preview/debian10/meta.json         |  7 ++++++-
 release/preview/debian9/docker/Dockerfile  |  3 +--
 release/preview/debian9/getLatestTag.ps1   | 14 --------------
 release/preview/debian9/meta.json          |  7 ++++++-
 release/stable/debian10/docker/Dockerfile  |  5 ++---
 release/stable/debian10/getLatestTag.ps1   | 14 --------------
 release/stable/debian10/meta.json          |  7 ++++++-
 release/stable/debian9/docker/Dockerfile   |  3 +--
 release/stable/debian9/getLatestTag.ps1    | 14 --------------
 release/stable/debian9/meta.json           |  7 ++++++-
 18 files changed, 43 insertions(+), 104 deletions(-)
 delete mode 100644 release/lts/debian10/getLatestTag.ps1
 delete mode 100644 release/lts/debian9/getLatestTag.ps1
 delete mode 100644 release/preview/debian10/getLatestTag.ps1
 delete mode 100644 release/preview/debian9/getLatestTag.ps1
 delete mode 100644 release/stable/debian10/getLatestTag.ps1
 delete mode 100644 release/stable/debian9/getLatestTag.ps1

diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
index b17eb1b94..665417552 100644
--- a/release/lts/debian10/docker/Dockerfile
+++ b/release/lts/debian10/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=buster-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:buster-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +22,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM ${imageRepo}:buster-slim
 
 ARG PS_VERSION=7.0.0
 ARG PS_INSTALL_VERSION=7-lts
diff --git a/release/lts/debian10/getLatestTag.ps1 b/release/lts/debian10/getLatestTag.ps1
deleted file mode 100644
index eeab402e1..000000000
--- a/release/lts/debian10/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('buster-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'buster-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '10' -SkipShortTagFilter
diff --git a/release/lts/debian10/meta.json b/release/lts/debian10/meta.json
index 7efa5faf4..da101b4c2 100644
--- a/release/lts/debian10/meta.json
+++ b/release/lts/debian10/meta.json
@@ -5,11 +5,15 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
+        "lts-debian-#shorttag#-#fulltag#",
         "lts-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "buster-slim"},
+        {"Tag": "10"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
     }
 }
-
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index 9f2a8229c..f292b6dd3 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb
diff --git a/release/lts/debian9/getLatestTag.ps1 b/release/lts/debian9/getLatestTag.ps1
deleted file mode 100644
index 22da10773..000000000
--- a/release/lts/debian9/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('stretch-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/lts/debian9/meta.json b/release/lts/debian9/meta.json
index b57a2014b..c7979ff78 100644
--- a/release/lts/debian9/meta.json
+++ b/release/lts/debian9/meta.json
@@ -5,8 +5,13 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
+        "lts-debian-#shorttag#-#fulltag#",
         "lts-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "stretch-slim"},
+        {"Tag": "9"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index d4e118db0..25458759a 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=buster-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:buster-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +22,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM ${imageRepo}:buster-slim
 
 ARG PS_VERSION=6.2.0-preview.3
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/preview/debian10/getLatestTag.ps1 b/release/preview/debian10/getLatestTag.ps1
deleted file mode 100644
index eeab402e1..000000000
--- a/release/preview/debian10/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('buster-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'buster-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '10' -SkipShortTagFilter
diff --git a/release/preview/debian10/meta.json b/release/preview/debian10/meta.json
index dac73cd56..58f46e9e7 100644
--- a/release/preview/debian10/meta.json
+++ b/release/preview/debian10/meta.json
@@ -5,9 +5,14 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "buster-slim"},
+        {"Tag": "10"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 70c1544a4..91721993e 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb
diff --git a/release/preview/debian9/getLatestTag.ps1 b/release/preview/debian9/getLatestTag.ps1
deleted file mode 100644
index 22da10773..000000000
--- a/release/preview/debian9/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('stretch-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/preview/debian9/meta.json b/release/preview/debian9/meta.json
index b26f165c3..929fcba64 100644
--- a/release/preview/debian9/meta.json
+++ b/release/preview/debian9/meta.json
@@ -5,9 +5,14 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "stretch-slim"},
+        {"Tag": "9"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index 236cc1f37..04770d8cc 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=buster-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:buster-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.3
@@ -23,7 +22,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
+FROM ${imageRepo}:buster-slim
 
 ARG PS_VERSION=7.0.0
 ARG PS_INSTALL_VERSION=7
diff --git a/release/stable/debian10/getLatestTag.ps1 b/release/stable/debian10/getLatestTag.ps1
deleted file mode 100644
index eeab402e1..000000000
--- a/release/stable/debian10/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('buster-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'buster-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '10' -SkipShortTagFilter
diff --git a/release/stable/debian10/meta.json b/release/stable/debian10/meta.json
index 321f76346..7d70a28d4 100644
--- a/release/stable/debian10/meta.json
+++ b/release/stable/debian10/meta.json
@@ -5,9 +5,14 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "buster-slim"},
+        {"Tag": "10"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 6418e45e2..d62faa72d 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
diff --git a/release/stable/debian9/getLatestTag.ps1 b/release/stable/debian9/getLatestTag.ps1
deleted file mode 100644
index 22da10773..000000000
--- a/release/stable/debian9/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('stretch-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/stable/debian9/meta.json b/release/stable/debian9/meta.json
index e8e66cada..aa3aa389e 100644
--- a/release/stable/debian9/meta.json
+++ b/release/stable/debian9/meta.json
@@ -5,9 +5,14 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#tag#",
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "stretch-slim"},
+        {"Tag": "9"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314

From 05b4a56abde429194e6b946a9f7ab9d342d29a14 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 29 Oct 2020 05:05:49 +0800
Subject: [PATCH 115/354] Community-Stable OracleLinux: Add Dependabot
 capability (#510)

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .github/dependabot.yml                         | 5 +++++
 release/community-stable/oraclelinux/meta.json | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7c2fe816a..b1208ec55 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -42,3 +42,8 @@ updates:
     directory: "/release/preview/windowsservercore/dependabot"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/release/community-stable/oraclelinux/docker"
+    schedule:
+      interval: "weekly"
diff --git a/release/community-stable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
index 988a2948b..a2f4b5258 100644
--- a/release/community-stable/oraclelinux/meta.json
+++ b/release/community-stable/oraclelinux/meta.json
@@ -3,10 +3,10 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "SkipGssNtlmSspTests": false,
     "shortTags": [
-        {"Tag": "latest"}
+        {"Tag": "8.2"}
     ],
     "tagTemplates": [
-        "#psversion#-oraclelinux-#tag#",
+        "#psversion#-oraclelinux-#shorttag#",
         "oraclelinux"
     ]
 }

From cf11e25ae0db34ebcd200d9ce34841e1b0d50de2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Oct 2020 18:12:40 -0400
Subject: [PATCH 116/354] Bump alpine from 3.11 to 3.12.1 in
 /release/preview/alpine311/docker (#509)

---
 .github/dependabot.yml                        |  2 +-
 release/preview/alpine312/docker/Dockerfile   | 89 +++++++++++++++++++
 release/preview/alpine312/meta.json           | 18 ++++
 .../alpine312/test-deps/docker/Dockerfile     | 38 ++++++++
 release/preview/alpine312/test-deps/meta.json | 19 ++++
 5 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 release/preview/alpine312/docker/Dockerfile
 create mode 100644 release/preview/alpine312/meta.json
 create mode 100644 release/preview/alpine312/test-deps/docker/Dockerfile
 create mode 100644 release/preview/alpine312/test-deps/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b1208ec55..4959310c7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,7 +4,7 @@ version: 2
 
 updates:
   - package-ecosystem: "docker"
-    directory: "/release/preview/alpine311/docker"
+    directory: "/release/preview/alpine312/docker"
     schedule:
       interval: "weekly"
 
diff --git a/release/preview/alpine312/docker/Dockerfile b/release/preview/alpine312/docker/Dockerfile
new file mode 100644
index 000000000..659f3f22c
--- /dev/null
+++ b/release/preview/alpine312/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.12 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.12.1
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine312/meta.json b/release/preview/alpine312/meta.json
new file mode 100644
index 000000000..dacef7d8b
--- /dev/null
+++ b/release/preview/alpine312/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "preview-alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.12"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/preview/alpine312/test-deps/docker/Dockerfile b/release/preview/alpine312/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..57f3dbbaf
--- /dev/null
+++ b/release/preview/alpine312/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine312/test-deps/meta.json b/release/preview/alpine312/test-deps/meta.json
new file mode 100644
index 000000000..49b703f2b
--- /dev/null
+++ b/release/preview/alpine312/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.12$" : "preview-alpine-3.12"
+    }
+}

From d414d3058ce86cf96a3b551c2515a70bb56a437b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 11 Nov 2020 15:13:01 -0800
Subject: [PATCH 117/354] Merge preview changes into stable for 7.1 release
 (#518)

---
 release/preview/alpine310/test-deps/meta.json |  1 -
 release/preview/alpine311/docker/Dockerfile   |  2 +-
 release/preview/alpine311/meta.json           |  2 +-
 release/preview/centos7/docker/Dockerfile     | 14 ++-
 release/preview/centos7/getLatestTag.ps1      | 14 ---
 release/preview/centos7/meta.json             |  5 +-
 release/preview/centos8/dependabot/Dockerfile |  6 --
 release/preview/centos8/docker/Dockerfile     | 13 +--
 release/preview/centos8/getLatestTag.ps1      | 14 ---
 release/preview/centos8/meta.json             |  5 +-
 .../centos8/test-deps/docker/Dockerfile       |  4 +-
 .../preview/debian10/dependabot/Dockerfile    |  6 --
 release/preview/debian10/docker/Dockerfile    |  3 +
 .../preview/debian11/dependabot/Dockerfile    |  6 --
 release/preview/debian11/docker/Dockerfile    |  3 +
 release/preview/debian9/docker/Dockerfile     |  3 +
 .../fedora31/test-deps/docker/Dockerfile      | 22 -----
 .../{fedora31 => fedora32}/docker/Dockerfile  | 51 +++-------
 .../preview/{fedora31 => fedora32}/meta.json  | 12 +--
 release/preview/ubuntu16.04/docker/Dockerfile |  3 +
 release/preview/ubuntu18.04/docker/Dockerfile |  7 +-
 release/preview/ubuntu18.04/meta.json         |  4 +-
 release/preview/ubuntu20.04/docker/Dockerfile |  5 +-
 release/preview/ubuntu20.04/meta.json         | 10 +-
 release/stable/alpine310/docker/Dockerfile    |  7 +-
 release/stable/alpine310/meta.json            |  3 +-
 .../alpine310/test-deps/docker/Dockerfile     |  4 +-
 release/stable/alpine310/test-deps/meta.json  |  3 +-
 release/stable/alpine311/docker/Dockerfile    | 87 +++++++++++++++++
 release/stable/alpine311/meta.json            | 18 ++++
 .../alpine311/test-deps/docker/Dockerfile     | 38 ++++++++
 .../alpine311}/test-deps/meta.json            | 12 +--
 release/stable/alpine312/docker/Dockerfile    | 87 +++++++++++++++++
 release/stable/alpine312/meta.json            | 18 ++++
 .../alpine312/test-deps/docker/Dockerfile     | 38 ++++++++
 release/stable/alpine312/test-deps/meta.json  | 19 ++++
 release/stable/centos7/docker/Dockerfile      | 10 +-
 release/stable/centos7/getLatestTag.ps1       | 14 ---
 release/stable/centos7/meta.json              |  5 +-
 release/stable/centos8/dependabot/Dockerfile  |  6 --
 release/stable/centos8/docker/Dockerfile      | 13 +--
 release/stable/centos8/getLatestTag.ps1       | 14 ---
 release/stable/centos8/meta.json              |  5 +-
 release/stable/debian10/dependabot/Dockerfile |  6 --
 release/stable/debian10/docker/Dockerfile     |  3 +
 release/stable/debian11/dependabot/Dockerfile |  6 --
 release/stable/debian11/docker/Dockerfile     |  3 +
 release/stable/debian11/meta.json             |  2 +-
 release/stable/debian11/test-deps/meta.json   |  2 +-
 release/stable/debian9/docker/Dockerfile      |  6 +-
 release/stable/fedora32/docker/Dockerfile     |  6 +-
 release/stable/fedora32/meta.json             |  3 +
 release/stable/ubuntu16.04/docker/Dockerfile  |  3 +
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +
 release/stable/ubuntu18.04/docker/Dockerfile  |  7 +-
 release/stable/ubuntu20.04/docker/Dockerfile  | 94 +++++++++++++++++++
 release/stable/ubuntu20.04/meta.json          | 20 ++++
 .../ubuntu20.04/test-deps/docker/Dockerfile   | 21 +++++
 .../stable/ubuntu20.04/test-deps/meta.json    | 16 ++++
 .../photon/docker/Dockerfile                  |  0
 .../photon/meta.json                          |  0
 61 files changed, 581 insertions(+), 235 deletions(-)
 delete mode 100644 release/preview/centos7/getLatestTag.ps1
 delete mode 100644 release/preview/centos8/dependabot/Dockerfile
 delete mode 100644 release/preview/centos8/getLatestTag.ps1
 delete mode 100644 release/preview/debian10/dependabot/Dockerfile
 delete mode 100644 release/preview/debian11/dependabot/Dockerfile
 delete mode 100644 release/preview/fedora31/test-deps/docker/Dockerfile
 rename release/preview/{fedora31 => fedora32}/docker/Dockerfile (54%)
 rename release/preview/{fedora31 => fedora32}/meta.json (52%)
 create mode 100644 release/stable/alpine311/docker/Dockerfile
 create mode 100644 release/stable/alpine311/meta.json
 create mode 100644 release/stable/alpine311/test-deps/docker/Dockerfile
 rename release/{preview/fedora31 => stable/alpine311}/test-deps/meta.json (51%)
 create mode 100644 release/stable/alpine312/docker/Dockerfile
 create mode 100644 release/stable/alpine312/meta.json
 create mode 100644 release/stable/alpine312/test-deps/docker/Dockerfile
 create mode 100644 release/stable/alpine312/test-deps/meta.json
 delete mode 100644 release/stable/centos7/getLatestTag.ps1
 delete mode 100644 release/stable/centos8/dependabot/Dockerfile
 delete mode 100644 release/stable/centos8/getLatestTag.ps1
 delete mode 100644 release/stable/debian10/dependabot/Dockerfile
 delete mode 100644 release/stable/debian11/dependabot/Dockerfile
 create mode 100644 release/stable/ubuntu20.04/docker/Dockerfile
 create mode 100644 release/stable/ubuntu20.04/meta.json
 create mode 100644 release/stable/ubuntu20.04/test-deps/docker/Dockerfile
 create mode 100644 release/stable/ubuntu20.04/test-deps/meta.json
 rename release/{community-stable => unstable}/photon/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/photon/meta.json (100%)

diff --git a/release/preview/alpine310/test-deps/meta.json b/release/preview/alpine310/test-deps/meta.json
index 0ec28911a..e9d691b94 100644
--- a/release/preview/alpine310/test-deps/meta.json
+++ b/release/preview/alpine310/test-deps/meta.json
@@ -14,7 +14,6 @@
         "size": 296
     },
     "TagMapping": {
-        "^.*-alpine-3.9$" : "preview-alpine-3.9",
         "^.*-alpine-3.10$" : "preview-alpine-3.10"
     }
 }
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
index 132ea76fd..59f413e2a 100644
--- a/release/preview/alpine311/docker/Dockerfile
+++ b/release/preview/alpine311/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
index 1e4e5b1de..470d8dcc0 100644
--- a/release/preview/alpine311/meta.json
+++ b/release/preview/alpine311/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.11",
     "tagTemplates": [
-        "#psversion#-alpine-3.11-#fulltag#",
+        "#psversion#-alpine-#shorttag#-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index ddcede43b..05385371c 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=7
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:7 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
@@ -32,6 +28,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
       # PowerShell remoting over SSH dependencies
       openssh-clients \
     && yum upgrade-minimal -y --security \
diff --git a/release/preview/centos7/getLatestTag.ps1 b/release/preview/centos7/getLatestTag.ps1
deleted file mode 100644
index 2d9d1ce17..000000000
--- a/release/preview/centos7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('7')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^7$' -OnlyShortTags
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
index 3c24edb7c..017f9c9f5 100644
--- a/release/preview/centos7/meta.json
+++ b/release/preview/centos7/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
-        "#psversion#-centos-#tag#",
+        "#psversion#-centos-#shorttag#-#fulltag#",
         "preview-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "7"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 550
diff --git a/release/preview/centos8/dependabot/Dockerfile b/release/preview/centos8/dependabot/Dockerfile
deleted file mode 100644
index 635aa6180..000000000
--- a/release/preview/centos8/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM centos:8
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index 7161c2c45..c0fb8041e 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=8
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
@@ -38,6 +34,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
+    # && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
diff --git a/release/preview/centos8/getLatestTag.ps1 b/release/preview/centos8/getLatestTag.ps1
deleted file mode 100644
index 7de27c1c3..000000000
--- a/release/preview/centos8/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
index 9c68b3e92..ede7e72cb 100644
--- a/release/preview/centos8/meta.json
+++ b/release/preview/centos8/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 8",
     "tagTemplates": [
-        "#psversion#-centos-#tag#",
+        "#psversion#-centos-#shorttag#-#fulltag#",
         "preview-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "8"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 723
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
index b41a2cefd..d44b77bb3 100644
--- a/release/preview/centos8/test-deps/docker/Dockerfile
+++ b/release/preview/centos8/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
+ARG BaseImage=mcr.microsoft.com/powershell:centos-8
 
 FROM ${BaseImage}
 
@@ -11,7 +11,7 @@ RUN yum install -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-8
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/debian10/dependabot/Dockerfile b/release/preview/debian10/dependabot/Dockerfile
deleted file mode 100644
index 505b9d83e..000000000
--- a/release/preview/debian10/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:10
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 25458759a..5feb3d41f 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 ARG imageRepo=debian
 
diff --git a/release/preview/debian11/dependabot/Dockerfile b/release/preview/debian11/dependabot/Dockerfile
deleted file mode 100644
index 6e90fb911..000000000
--- a/release/preview/debian11/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:11
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index adc25aef2..7269b7f29 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 
 FROM debian:bullseye-slim AS installer-env
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 91721993e..34fdfed06 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
 ARG imageRepo=debian
 
diff --git a/release/preview/fedora31/test-deps/docker/Dockerfile b/release/preview/fedora31/test-deps/docker/Dockerfile
deleted file mode 100644
index 656afd0ff..000000000
--- a/release/preview/fedora31/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Fedora 28 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
-
-FROM ${BaseImage}
-
-ARG fromTag=28
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        findutils \
-        hostname \
-        iputils \
-        wget \
-        procps-ng \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-${fromTag}
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/fedora31/docker/Dockerfile b/release/preview/fedora32/docker/Dockerfile
similarity index 54%
rename from release/preview/fedora31/docker/Dockerfile
rename to release/preview/fedora32/docker/Dockerfile
index 3e6b15f20..66f9e665b 100644
--- a/release/preview/fedora31/docker/Dockerfile
+++ b/release/preview/fedora32/docker/Dockerfile
@@ -1,9 +1,13 @@
-# Docker image file that describes Fedora 31 image with PowerShell installed from Microsoft YUM Repo
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM fedora:31 AS installer-env
+# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
+ARG imageRepo=fedora
 
-ARG PS_VERSION=7.0.0-preview.1
-ARG PACKAGE_VERSION=7.0.0_preview.1
+FROM ${imageRepo}:32 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
@@ -14,7 +18,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-31
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
@@ -31,50 +35,17 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       compat-openssl10 \
       ca-certificates \
       gssntlmssp \
-    # PowerShell remoting over SSH dependencies
-      openssh-clients \
     && echo "end - misc packages" \
     && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    && echo "starting FEDORA-2019-27e7b92407" \
-    # For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
-    # to do this, upgrade libmodulemd1, if it is installed
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          try { \$packageList = dnf list installed libmodulemd1} \
-          catch {}; \
-          \$module = (\$packageList | Select-String -SimpleMatch libmodulemd1);  \
-          if(\$module) { \
-            Write-Host '******* Patching *********'; \
-            dnf upgrade -y libmodulemd1 \
-          }" \
-    && echo "end - FEDORA-2019-27e7b92407" \
     # This installs most security advisories
     && echo "starting upgrade minimal" \
     && dnf upgrade-minimal -y --security \
     && echo "end - upgrade minimal" \
-    # query and install any remaining security advisories
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          Write-Host '******* Getting security advisory list *********'; \
-          (dnf updateinfo list -q --security) |  \
-              Foreach-Object { \
-                  \$advisory=(\$_ -split ' ')[0]; \
-                  Write-Host '******* Patching *********'; \
-                  Write-Host \$advisory; \
-                  Write-Host '************************'; \
-                  dnf upgrade -y --advisory=\$advisory \
-              }" \
     && echo "verifying all security advisories are installed..." \
     && dnf updateinfo list -q --security \
     && echo "end - verifying all security advisories are installed..." \
     && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
@@ -89,4 +60,4 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
+CMD [ "pwsh" ]
diff --git a/release/preview/fedora31/meta.json b/release/preview/fedora32/meta.json
similarity index 52%
rename from release/preview/fedora31/meta.json
rename to release/preview/fedora32/meta.json
index 637c46b7d..d564c12a3 100644
--- a/release/preview/fedora31/meta.json
+++ b/release/preview/fedora32/meta.json
@@ -1,18 +1,16 @@
 {
-    "IsLinux" : true,
+    "IsLinux": true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora 31",
+    "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-#shorttag#-#fulltag#",
-        "#psversion#-fedora-#shorttag#",
-        "preview-fedora-#shorttag#"
+        "#psversion#-fedora-32-#fulltag#",
+        "preview-fedora-32"
     ],
     "shortTags": [
-        {"Tag": "31"}
+        {"Tag": "32"}
     ],
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
     }
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 2ee0776d6..03dd1e6c4 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
 
 FROM ubuntu:16.04 AS installer-env
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 73dc85593..5728e0654 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -1,9 +1,10 @@
-# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=18.04
-ARG imageRepo=ubuntu
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
+# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
 FROM ubuntu:18.04 AS installer-env
 
+# Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index 7b6b02b3d..c7733429d 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -5,8 +5,8 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-18.04-#fulltag#",
-        "#psversion#-ubuntu-bionic-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index 70f33c799..f0e388f8b 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
 FROM ubuntu:20.04 AS installer-env
 
@@ -40,7 +43,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
 
 # Install dependencies and clean up
 RUN apt-get update \
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
index ebb497e94..59fb5b571 100644
--- a/release/preview/ubuntu20.04/meta.json
+++ b/release/preview/ubuntu20.04/meta.json
@@ -4,13 +4,15 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "osVersion": "Ubuntu 20.04",
     "SkipGssNtlmSspTests": false,
-    "shortTags": [
-        {"Tag": "20.04"}
-    ],
     "tagTemplates": [
-        "#psversion#-ubuntu-20.04-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
         "preview-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/stable/alpine310/docker/Dockerfile b/release/stable/alpine310/docker/Dockerfile
index 3a32ed1a4..f27f52237 100644
--- a/release/stable/alpine310/docker/Dockerfile
+++ b/release/stable/alpine310/docker/Dockerfile
@@ -3,8 +3,6 @@
 
 # Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
 
-# Define arg(s) needed for the From statement
-
 FROM alpine:3.10 AS installer-env
 
 # Define Args for the needed to add the package
@@ -28,8 +26,6 @@ RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM alpine:3.10
 
-ARG fromTag=3.10
-
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
@@ -43,8 +39,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-${fromTag}
-
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.10
 # Install dotnet dependencies and ca-certificates
 RUN apk add --no-cache \
     ca-certificates \
diff --git a/release/stable/alpine310/meta.json b/release/stable/alpine310/meta.json
index 18d3ecec0..5562cee04 100644
--- a/release/stable/alpine310/meta.json
+++ b/release/stable/alpine310/meta.json
@@ -4,6 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.10",
     "tagTemplates": [
+        "#psversion#-alpine-#shorttag#",
         "#psversion#-alpine-3.10-#fulltag#",
         "alpine-#shorttag#"
     ],
@@ -13,6 +14,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 175
+        "size": 225
     }
 }
diff --git a/release/stable/alpine310/test-deps/docker/Dockerfile b/release/stable/alpine310/test-deps/docker/Dockerfile
index 1fb8267a4..3e3fd4ece 100644
--- a/release/stable/alpine310/test-deps/docker/Dockerfile
+++ b/release/stable/alpine310/test-deps/docker/Dockerfile
@@ -8,12 +8,10 @@ FROM node:14.3.0-alpine as node
 
 FROM ${BaseImage}
 
-ARG fromTag=3.9
-
 ENV NODE_VERSION=14.3.0 \
     YARN_VERSION=1.22.4 \
     NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.9
 
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
diff --git a/release/stable/alpine310/test-deps/meta.json b/release/stable/alpine310/test-deps/meta.json
index 942d07c72..700fb5195 100644
--- a/release/stable/alpine310/test-deps/meta.json
+++ b/release/stable/alpine310/test-deps/meta.json
@@ -11,10 +11,9 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 255
+        "size": 296
     },
     "TagMapping": {
-        "^.*-alpine-3.9$" : "alpine-3.9",
         "^.*-alpine-3.10$" : "alpine-3.10"
     }
 }
diff --git a/release/stable/alpine311/docker/Dockerfile b/release/stable/alpine311/docker/Dockerfile
new file mode 100644
index 000000000..82cccd512
--- /dev/null
+++ b/release/stable/alpine311/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.11 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.11
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine311/meta.json b/release/stable/alpine311/meta.json
new file mode 100644
index 000000000..4fafe0d29
--- /dev/null
+++ b/release/stable/alpine311/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.11",
+    "tagTemplates": [
+        "#psversion#-alpine-3.11-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.11"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/stable/alpine311/test-deps/docker/Dockerfile b/release/stable/alpine311/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..85d48d3af
--- /dev/null
+++ b/release/stable/alpine311/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/fedora31/test-deps/meta.json b/release/stable/alpine311/test-deps/meta.json
similarity index 51%
rename from release/preview/fedora31/test-deps/meta.json
rename to release/stable/alpine311/test-deps/meta.json
index 8bbce1337..c2139fd9e 100644
--- a/release/preview/fedora31/test-deps/meta.json
+++ b/release/stable/alpine311/test-deps/meta.json
@@ -1,19 +1,19 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora 31",
-    "SkipGssNtlmSspTests": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.11",
     "tagTemplates": [
         "#tag#"
     ],
-    "SubRepository": "test-deps",
     "OptionalTests": [
-        "test-deps"
+        "test-deps",
+        "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 632
+        "size": 295
     },
     "TagMapping": {
-        ".*" : "preview-fedora-31"
+        "^.*-alpine-3.11$" : "alpine-3.11"
     }
 }
diff --git a/release/stable/alpine312/docker/Dockerfile b/release/stable/alpine312/docker/Dockerfile
new file mode 100644
index 000000000..7b8e05a8c
--- /dev/null
+++ b/release/stable/alpine312/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.12 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.12.1
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine312/meta.json b/release/stable/alpine312/meta.json
new file mode 100644
index 000000000..6ed4aeb61
--- /dev/null
+++ b/release/stable/alpine312/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.12"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/stable/alpine312/test-deps/docker/Dockerfile b/release/stable/alpine312/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..57f3dbbaf
--- /dev/null
+++ b/release/stable/alpine312/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine312/test-deps/meta.json b/release/stable/alpine312/test-deps/meta.json
new file mode 100644
index 000000000..49b703f2b
--- /dev/null
+++ b/release/stable/alpine312/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.12$" : "preview-alpine-3.12"
+    }
+}
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index d62030878..13e534365 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -1,8 +1,7 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=7
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:7 AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PACKAGE_VERSION=6.2.0
@@ -14,7 +13,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
diff --git a/release/stable/centos7/getLatestTag.ps1 b/release/stable/centos7/getLatestTag.ps1
deleted file mode 100644
index 2d9d1ce17..000000000
--- a/release/stable/centos7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('7')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^7$' -OnlyShortTags
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index ac5d65a9a..4dac265f2 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
-        "#psversion#-centos-#tag#",
+        "#psversion#-centos-#shorttag#-#fulltag#",
         "centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "7"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 550
diff --git a/release/stable/centos8/dependabot/Dockerfile b/release/stable/centos8/dependabot/Dockerfile
deleted file mode 100644
index 635aa6180..000000000
--- a/release/stable/centos8/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM centos:8
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index 817ac3097..48575c79e 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=8
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
@@ -38,6 +34,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
+    # && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
diff --git a/release/stable/centos8/getLatestTag.ps1 b/release/stable/centos8/getLatestTag.ps1
deleted file mode 100644
index 7de27c1c3..000000000
--- a/release/stable/centos8/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
index 9d58fabdf..6ae835c9b 100644
--- a/release/stable/centos8/meta.json
+++ b/release/stable/centos8/meta.json
@@ -4,9 +4,12 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 8",
     "tagTemplates": [
-        "#psversion#-centos-#tag#",
+        "#psversion#-centos-#shorttag#-#fulltag#",
         "centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "8"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 723
diff --git a/release/stable/debian10/dependabot/Dockerfile b/release/stable/debian10/dependabot/Dockerfile
deleted file mode 100644
index 505b9d83e..000000000
--- a/release/stable/debian10/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:10
diff --git a/release/stable/debian10/docker/Dockerfile b/release/stable/debian10/docker/Dockerfile
index 04770d8cc..35a48e07f 100644
--- a/release/stable/debian10/docker/Dockerfile
+++ b/release/stable/debian10/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 ARG imageRepo=debian
 
diff --git a/release/stable/debian11/dependabot/Dockerfile b/release/stable/debian11/dependabot/Dockerfile
deleted file mode 100644
index 6e90fb911..000000000
--- a/release/stable/debian11/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:11
diff --git a/release/stable/debian11/docker/Dockerfile b/release/stable/debian11/docker/Dockerfile
index bdf05a54d..5000c9940 100644
--- a/release/stable/debian11/docker/Dockerfile
+++ b/release/stable/debian11/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 
 FROM debian:bullseye-slim AS installer-env
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
index cdeddc9c0..ab829767e 100644
--- a/release/stable/debian11/meta.json
+++ b/release/stable/debian11/meta.json
@@ -15,7 +15,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 314
+        "size": 350
     }
 }
 
diff --git a/release/stable/debian11/test-deps/meta.json b/release/stable/debian11/test-deps/meta.json
index 4532e5500..424e8a54f 100644
--- a/release/stable/debian11/test-deps/meta.json
+++ b/release/stable/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 332
+        "size": 350
     }
 }
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index d62faa72d..67d72d712 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
 ARG imageRepo=debian
 
@@ -12,7 +15,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
 
 # Install dependencies and clean up
 RUN apt-get update \
diff --git a/release/stable/fedora32/docker/Dockerfile b/release/stable/fedora32/docker/Dockerfile
index ef84edaca..71a2cff3a 100644
--- a/release/stable/fedora32/docker/Dockerfile
+++ b/release/stable/fedora32/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
 ARG imageRepo=fedora
 
@@ -33,7 +36,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       ca-certificates \
       gssntlmssp \
     && echo "end - misc packages" \
-    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
     # This installs most security advisories
     && echo "starting upgrade minimal" \
     && dnf upgrade-minimal -y --security \
@@ -42,7 +44,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && dnf updateinfo list -q --security \
     && echo "end - verifying all security advisories are installed..." \
     && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
diff --git a/release/stable/fedora32/meta.json b/release/stable/fedora32/meta.json
index d48abd0af..237283614 100644
--- a/release/stable/fedora32/meta.json
+++ b/release/stable/fedora32/meta.json
@@ -9,6 +9,9 @@
         "#psversion#-fedora-32",
         "fedora-32-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "32"}
+    ],
     "TestProperties": {
         "size": 632
     }
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index 70633b9f6..3829808b9 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
 
 FROM ubuntu:16.04 AS installer-env
diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
index 9897b26cb..6e8192a52 100644
--- a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
+
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 3473e54d6..7a300024b 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -1,9 +1,10 @@
-# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=18.04
-ARG imageRepo=ubuntu
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
+# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
 FROM ubuntu:18.04 AS installer-env
 
+# Define Args for the needed to add the package
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
diff --git a/release/stable/ubuntu20.04/docker/Dockerfile b/release/stable/ubuntu20.04/docker/Dockerfile
new file mode 100644
index 000000000..1a831b710
--- /dev/null
+++ b/release/stable/ubuntu20.04/docker/Dockerfile
@@ -0,0 +1,94 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.4
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=7.1.0
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu20.04/meta.json b/release/stable/ubuntu20.04/meta.json
new file mode 100644
index 000000000..77f542929
--- /dev/null
+++ b/release/stable/ubuntu20.04/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
+        "ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/stable/ubuntu20.04/test-deps/docker/Dockerfile b/release/stable/ubuntu20.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..d9c7795a7
--- /dev/null
+++ b/release/stable/ubuntu20.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/ubuntu20.04/test-deps/meta.json b/release/stable/ubuntu20.04/test-deps/meta.json
new file mode 100644
index 000000000..b01cc7075
--- /dev/null
+++ b/release/stable/ubuntu20.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/community-stable/photon/docker/Dockerfile b/release/unstable/photon/docker/Dockerfile
similarity index 100%
rename from release/community-stable/photon/docker/Dockerfile
rename to release/unstable/photon/docker/Dockerfile
diff --git a/release/community-stable/photon/meta.json b/release/unstable/photon/meta.json
similarity index 100%
rename from release/community-stable/photon/meta.json
rename to release/unstable/photon/meta.json

From 48b6ddfcc4d598675817ff141bf29414a106bed0 Mon Sep 17 00:00:00 2001
From: Ryen Tang <kiazhi@hotmail.com>
Date: Thu, 12 Nov 2020 07:15:01 +0800
Subject: [PATCH 118/354] Fix PSModuleAnalysisCachePath path for Windows images
 (#515)

---
 release/lts/nanoserver1809/docker/Dockerfile            | 3 +--
 release/lts/nanoserver1903/docker/Dockerfile            | 3 +--
 release/lts/nanoserver1909/docker/Dockerfile            | 3 +--
 release/lts/nanoserver2004/docker/Dockerfile            | 3 +--
 release/lts/windowsservercore1809/docker/Dockerfile     | 3 +--
 release/lts/windowsservercore1903/docker/Dockerfile     | 3 +--
 release/lts/windowsservercore1909/docker/Dockerfile     | 3 +--
 release/lts/windowsservercore2004/docker/Dockerfile     | 3 +--
 release/preview/nanoserver1809/docker/Dockerfile        | 3 +--
 release/preview/nanoserver1903/docker/Dockerfile        | 3 +--
 release/preview/nanoserver1909/docker/Dockerfile        | 3 +--
 release/preview/nanoserver2004/docker/Dockerfile        | 3 +--
 release/preview/windowsservercore1809/docker/Dockerfile | 3 +--
 release/preview/windowsservercore1903/docker/Dockerfile | 3 +--
 release/preview/windowsservercore1909/docker/Dockerfile | 3 +--
 release/preview/windowsservercore2004/docker/Dockerfile | 3 +--
 release/servicing/nanoserver1809/docker/Dockerfile      | 3 +--
 release/servicing/windowsservercore/docker/Dockerfile   | 3 +--
 release/stable/nanoserver1809/docker/Dockerfile         | 3 +--
 release/stable/nanoserver1903/docker/Dockerfile         | 3 +--
 release/stable/nanoserver1909/docker/Dockerfile         | 3 +--
 release/stable/nanoserver2004/docker/Dockerfile         | 3 +--
 release/stable/windowsservercore1809/docker/Dockerfile  | 3 +--
 release/stable/windowsservercore1903/docker/Dockerfile  | 3 +--
 release/stable/windowsservercore1909/docker/Dockerfile  | 3 +--
 release/stable/windowsservercore2004/docker/Dockerfile  | 3 +--
 26 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
index a9c77428f..5ef5c9979 100755
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ b/release/lts/nanoserver1809/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/lts/nanoserver1903/docker/Dockerfile b/release/lts/nanoserver1903/docker/Dockerfile
index 56829288e..e4ff0d63b 100644
--- a/release/lts/nanoserver1903/docker/Dockerfile
+++ b/release/lts/nanoserver1903/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/lts/nanoserver1909/docker/Dockerfile b/release/lts/nanoserver1909/docker/Dockerfile
index 9f27cbe69..1cdbf2f4a 100644
--- a/release/lts/nanoserver1909/docker/Dockerfile
+++ b/release/lts/nanoserver1909/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/lts/nanoserver2004/docker/Dockerfile b/release/lts/nanoserver2004/docker/Dockerfile
index f6ccbc775..69290eabb 100644
--- a/release/lts/nanoserver2004/docker/Dockerfile
+++ b/release/lts/nanoserver2004/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/lts/windowsservercore1809/docker/Dockerfile b/release/lts/windowsservercore1809/docker/Dockerfile
index bc7d5a764..cd7a9321a 100644
--- a/release/lts/windowsservercore1809/docker/Dockerfile
+++ b/release/lts/windowsservercore1809/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1809
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
diff --git a/release/lts/windowsservercore1903/docker/Dockerfile b/release/lts/windowsservercore1903/docker/Dockerfile
index 789245f0d..c93030585 100644
--- a/release/lts/windowsservercore1903/docker/Dockerfile
+++ b/release/lts/windowsservercore1903/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1903
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
diff --git a/release/lts/windowsservercore1909/docker/Dockerfile b/release/lts/windowsservercore1909/docker/Dockerfile
index ba029d812..c1c2d033f 100644
--- a/release/lts/windowsservercore1909/docker/Dockerfile
+++ b/release/lts/windowsservercore1909/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1909
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
diff --git a/release/lts/windowsservercore2004/docker/Dockerfile b/release/lts/windowsservercore2004/docker/Dockerfile
index c4407ca50..2964e2fb0 100644
--- a/release/lts/windowsservercore2004/docker/Dockerfile
+++ b/release/lts/windowsservercore2004/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:2004
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index a9c77428f..5ef5c9979 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/preview/nanoserver1903/docker/Dockerfile b/release/preview/nanoserver1903/docker/Dockerfile
index 56829288e..e4ff0d63b 100644
--- a/release/preview/nanoserver1903/docker/Dockerfile
+++ b/release/preview/nanoserver1903/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/preview/nanoserver1909/docker/Dockerfile b/release/preview/nanoserver1909/docker/Dockerfile
index 9f27cbe69..1cdbf2f4a 100644
--- a/release/preview/nanoserver1909/docker/Dockerfile
+++ b/release/preview/nanoserver1909/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/preview/nanoserver2004/docker/Dockerfile b/release/preview/nanoserver2004/docker/Dockerfile
index f6ccbc775..69290eabb 100644
--- a/release/preview/nanoserver2004/docker/Dockerfile
+++ b/release/preview/nanoserver2004/docker/Dockerfile
@@ -46,8 +46,7 @@ ARG IMAGE_NAME=mcr.microsoft.com/powershell
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/preview/windowsservercore1809/docker/Dockerfile b/release/preview/windowsservercore1809/docker/Dockerfile
index 4820bacde..6b0568fd9 100644
--- a/release/preview/windowsservercore1809/docker/Dockerfile
+++ b/release/preview/windowsservercore1809/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1809
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
diff --git a/release/preview/windowsservercore1903/docker/Dockerfile b/release/preview/windowsservercore1903/docker/Dockerfile
index bd70196f8..10163b54f 100644
--- a/release/preview/windowsservercore1903/docker/Dockerfile
+++ b/release/preview/windowsservercore1903/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1903
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
diff --git a/release/preview/windowsservercore1909/docker/Dockerfile b/release/preview/windowsservercore1909/docker/Dockerfile
index f2b4c7b2d..11d4dd9ce 100644
--- a/release/preview/windowsservercore1909/docker/Dockerfile
+++ b/release/preview/windowsservercore1909/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1909
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
diff --git a/release/preview/windowsservercore2004/docker/Dockerfile b/release/preview/windowsservercore2004/docker/Dockerfile
index fc7caa4c7..464c526aa 100644
--- a/release/preview/windowsservercore2004/docker/Dockerfile
+++ b/release/preview/windowsservercore2004/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:2004
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index 649b984b8..4142c1c29 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -45,8 +45,7 @@ FROM ${NanoServerRepo}:${fromTag}
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index 871ba36ce..9269b7f9a 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -36,8 +36,7 @@ FROM ${WindowsServerCoreRepo}:${fromTag}
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_TELEMETRY_OPTOUT="1"
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index ee250469c..10f114941 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -44,8 +44,7 @@ FROM ${NanoServerRepo}:1809
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/stable/nanoserver1903/docker/Dockerfile b/release/stable/nanoserver1903/docker/Dockerfile
index 319e27d66..f8d5e3654 100644
--- a/release/stable/nanoserver1903/docker/Dockerfile
+++ b/release/stable/nanoserver1903/docker/Dockerfile
@@ -44,8 +44,7 @@ FROM ${NanoServerRepo}:1903
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/stable/nanoserver1909/docker/Dockerfile b/release/stable/nanoserver1909/docker/Dockerfile
index d682d613d..0270faf0c 100644
--- a/release/stable/nanoserver1909/docker/Dockerfile
+++ b/release/stable/nanoserver1909/docker/Dockerfile
@@ -44,8 +44,7 @@ FROM ${NanoServerRepo}:1909
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/stable/nanoserver2004/docker/Dockerfile b/release/stable/nanoserver2004/docker/Dockerfile
index 4382b0d98..e64094eff 100644
--- a/release/stable/nanoserver2004/docker/Dockerfile
+++ b/release/stable/nanoserver2004/docker/Dockerfile
@@ -44,8 +44,7 @@ FROM ${NanoServerRepo}:2004
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     # Set the default windows path so we can use it
diff --git a/release/stable/windowsservercore1809/docker/Dockerfile b/release/stable/windowsservercore1809/docker/Dockerfile
index 19e75a08a..f8a0fafe3 100644
--- a/release/stable/windowsservercore1809/docker/Dockerfile
+++ b/release/stable/windowsservercore1809/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1809
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
diff --git a/release/stable/windowsservercore1903/docker/Dockerfile b/release/stable/windowsservercore1903/docker/Dockerfile
index 94d333dba..3bdd2ae33 100644
--- a/release/stable/windowsservercore1903/docker/Dockerfile
+++ b/release/stable/windowsservercore1903/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1903
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
diff --git a/release/stable/windowsservercore1909/docker/Dockerfile b/release/stable/windowsservercore1909/docker/Dockerfile
index 78617c342..adf52d494 100644
--- a/release/stable/windowsservercore1909/docker/Dockerfile
+++ b/release/stable/windowsservercore1909/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:1909
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
diff --git a/release/stable/windowsservercore2004/docker/Dockerfile b/release/stable/windowsservercore2004/docker/Dockerfile
index fda450553..8e78ce63a 100644
--- a/release/stable/windowsservercore2004/docker/Dockerfile
+++ b/release/stable/windowsservercore2004/docker/Dockerfile
@@ -35,8 +35,7 @@ FROM ${WindowsServerCoreRepo}:2004
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
-    LOCALAPPDATA="C:\Users\ContainerAdministrator\AppData\Local" `
-    PSModuleAnalysisCachePath="$LOCALAPPDATA\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
     # Persist %PSCORE% ENV variable for user convenience
     PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
     POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `

From 4f477817a0d6ec9000af51659b93382bfff1e1d2 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 11 Nov 2020 18:30:13 -0500
Subject: [PATCH 119/354] merge preview into stable for 7.1 release for windows
 images (#519)

---
 release/preview/nanoserver1809/docker/Dockerfile            | 6 ++----
 release/preview/nanoserver1903/docker/Dockerfile            | 6 ++----
 release/preview/nanoserver1909/docker/Dockerfile            | 6 ++----
 release/preview/nanoserver2004/dependabot/Dockerfile        | 6 ------
 release/preview/nanoserver2004/docker/Dockerfile            | 6 ++----
 release/preview/windowsservercore2004/dependabot/Dockerfile | 6 ------
 release/stable/nanoserver1809/docker/Dockerfile             | 3 +++
 release/stable/nanoserver1903/docker/Dockerfile             | 3 +++
 release/stable/nanoserver1909/docker/Dockerfile             | 3 +++
 release/stable/nanoserver2004/docker/Dockerfile             | 3 +++
 release/stable/windowsservercore1809/docker/Dockerfile      | 3 +++
 release/stable/windowsservercore1903/docker/Dockerfile      | 3 +++
 release/stable/windowsservercore1909/docker/Dockerfile      | 3 +++
 release/stable/windowsservercore2004/docker/Dockerfile      | 3 +++
 14 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 release/preview/nanoserver2004/dependabot/Dockerfile
 delete mode 100644 release/preview/windowsservercore2004/dependabot/Dockerfile

diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index 5ef5c9979..58ca2bea5 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -13,11 +13,11 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 # disable telemetry
 ENV POWERSHELL_TELEMETRY_OPTOUT="1"
 
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 ARG PS_PACKAGE_URL_BASE64
 
 RUN Write-host "Verifying valid Version..."; `
@@ -41,8 +41,6 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:1809
 
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
diff --git a/release/preview/nanoserver1903/docker/Dockerfile b/release/preview/nanoserver1903/docker/Dockerfile
index e4ff0d63b..d10cb09f6 100644
--- a/release/preview/nanoserver1903/docker/Dockerfile
+++ b/release/preview/nanoserver1903/docker/Dockerfile
@@ -13,11 +13,11 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 # disable telemetry
 ENV POWERSHELL_TELEMETRY_OPTOUT="1"
 
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 ARG PS_PACKAGE_URL_BASE64
 
 RUN Write-host "Verifying valid Version..."; `
@@ -41,8 +41,6 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:1903
 
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
diff --git a/release/preview/nanoserver1909/docker/Dockerfile b/release/preview/nanoserver1909/docker/Dockerfile
index 1cdbf2f4a..870e0cf8b 100644
--- a/release/preview/nanoserver1909/docker/Dockerfile
+++ b/release/preview/nanoserver1909/docker/Dockerfile
@@ -13,11 +13,11 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 # disable telemetry
 ENV POWERSHELL_TELEMETRY_OPTOUT="1"
 
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 ARG PS_PACKAGE_URL_BASE64
 
 RUN Write-host "Verifying valid Version..."; `
@@ -41,8 +41,6 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:1909
 
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
diff --git a/release/preview/nanoserver2004/dependabot/Dockerfile b/release/preview/nanoserver2004/dependabot/Dockerfile
deleted file mode 100644
index 863e481c7..000000000
--- a/release/preview/nanoserver2004/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM mcr.microsoft.com/windows/nanoserver:2004
diff --git a/release/preview/nanoserver2004/docker/Dockerfile b/release/preview/nanoserver2004/docker/Dockerfile
index 69290eabb..1badb0d78 100644
--- a/release/preview/nanoserver2004/docker/Dockerfile
+++ b/release/preview/nanoserver2004/docker/Dockerfile
@@ -13,11 +13,11 @@ ARG PS_VERSION=7.0.0-rc.1
 
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
 
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 # disable telemetry
 ENV POWERSHELL_TELEMETRY_OPTOUT="1"
 
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
 ARG PS_PACKAGE_URL_BASE64
 
 RUN Write-host "Verifying valid Version..."; `
@@ -41,8 +41,6 @@ RUN Write-host "Verifying valid Version..."; `
 # Install PowerShell into NanoServer
 FROM ${NanoServerRepo}:2004
 
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
     # set a fixed location for the Module analysis cache
diff --git a/release/preview/windowsservercore2004/dependabot/Dockerfile b/release/preview/windowsservercore2004/dependabot/Dockerfile
deleted file mode 100644
index de415a7f7..000000000
--- a/release/preview/windowsservercore2004/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM mcr.microsoft.com/windows/servercore:2004
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index 10f114941..d71105565 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Args used by from statements must be defined here:
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
diff --git a/release/stable/nanoserver1903/docker/Dockerfile b/release/stable/nanoserver1903/docker/Dockerfile
index f8d5e3654..0842a49a9 100644
--- a/release/stable/nanoserver1903/docker/Dockerfile
+++ b/release/stable/nanoserver1903/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Args used by from statements must be defined here:
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
diff --git a/release/stable/nanoserver1909/docker/Dockerfile b/release/stable/nanoserver1909/docker/Dockerfile
index 0270faf0c..f46e57210 100644
--- a/release/stable/nanoserver1909/docker/Dockerfile
+++ b/release/stable/nanoserver1909/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Args used by from statements must be defined here:
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
diff --git a/release/stable/nanoserver2004/docker/Dockerfile b/release/stable/nanoserver2004/docker/Dockerfile
index e64094eff..e352e8f24 100644
--- a/release/stable/nanoserver2004/docker/Dockerfile
+++ b/release/stable/nanoserver2004/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Args used by from statements must be defined here:
 ARG InstallerVersion=nanoserver
 ARG InstallerRepo=mcr.microsoft.com/powershell
diff --git a/release/stable/windowsservercore1809/docker/Dockerfile b/release/stable/windowsservercore1809/docker/Dockerfile
index f8a0fafe3..c27d0f572 100644
--- a/release/stable/windowsservercore1809/docker/Dockerfile
+++ b/release/stable/windowsservercore1809/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
diff --git a/release/stable/windowsservercore1903/docker/Dockerfile b/release/stable/windowsservercore1903/docker/Dockerfile
index 3bdd2ae33..3921a3a76 100644
--- a/release/stable/windowsservercore1903/docker/Dockerfile
+++ b/release/stable/windowsservercore1903/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
diff --git a/release/stable/windowsservercore1909/docker/Dockerfile b/release/stable/windowsservercore1909/docker/Dockerfile
index adf52d494..354b9c209 100644
--- a/release/stable/windowsservercore1909/docker/Dockerfile
+++ b/release/stable/windowsservercore1909/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,
diff --git a/release/stable/windowsservercore2004/docker/Dockerfile b/release/stable/windowsservercore2004/docker/Dockerfile
index 8e78ce63a..9c4a2f26a 100644
--- a/release/stable/windowsservercore2004/docker/Dockerfile
+++ b/release/stable/windowsservercore2004/docker/Dockerfile
@@ -1,4 +1,7 @@
 # escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
 
 # Use server core as an installer container to extract PowerShell,

From bef735da0e2409da1cd094ee3df354996247becf Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Tue, 17 Nov 2020 15:40:38 -0500
Subject: [PATCH 120/354] Drop alpine 3.10 on preview and stable (#521)

Signed-off-by: Reece Dunham <me@rdil.rocks>
---
 .github/dependabot.yml                        |  2 +-
 .../preview/alpine310/dependabot/Dockerfile   |  6 --
 release/preview/alpine310/docker/Dockerfile   | 86 -------------------
 release/preview/alpine310/meta.json           | 19 ----
 .../alpine310/test-deps/docker/Dockerfile     | 38 --------
 release/preview/alpine310/test-deps/meta.json | 19 ----
 .../stable/alpine310/dependabot/Dockerfile    |  6 --
 release/stable/alpine310/docker/Dockerfile    | 84 ------------------
 release/stable/alpine310/meta.json            | 19 ----
 .../alpine310/test-deps/docker/Dockerfile     | 38 --------
 release/stable/alpine310/test-deps/meta.json  | 19 ----
 tools/.gitpod.Dockerfile                      |  4 +-
 12 files changed, 2 insertions(+), 338 deletions(-)
 delete mode 100644 release/preview/alpine310/dependabot/Dockerfile
 delete mode 100644 release/preview/alpine310/docker/Dockerfile
 delete mode 100644 release/preview/alpine310/meta.json
 delete mode 100644 release/preview/alpine310/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/alpine310/test-deps/meta.json
 delete mode 100644 release/stable/alpine310/dependabot/Dockerfile
 delete mode 100644 release/stable/alpine310/docker/Dockerfile
 delete mode 100644 release/stable/alpine310/meta.json
 delete mode 100644 release/stable/alpine310/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/alpine310/test-deps/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4959310c7..a9343f5ea 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 version: 2
 
-# update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex
+# update_schedule: live is not supported by docker
 
 updates:
   - package-ecosystem: "docker"
diff --git a/release/preview/alpine310/dependabot/Dockerfile b/release/preview/alpine310/dependabot/Dockerfile
deleted file mode 100644
index cf983a1b7..000000000
--- a/release/preview/alpine310/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.10.0
diff --git a/release/preview/alpine310/docker/Dockerfile b/release/preview/alpine310/docker/Dockerfile
deleted file mode 100644
index cc54eef78..000000000
--- a/release/preview/alpine310/docker/Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.10 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.10
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.10
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine310/meta.json b/release/preview/alpine310/meta.json
deleted file mode 100644
index d5ae751bf..000000000
--- a/release/preview/alpine310/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.10",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "#psversion#-alpine-#shorttag#-#fulltag#",
-        "preview-alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.10"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 225
-    }
-}
diff --git a/release/preview/alpine310/test-deps/docker/Dockerfile b/release/preview/alpine310/test-deps/docker/Dockerfile
deleted file mode 100644
index 3e3fd4ece..000000000
--- a/release/preview/alpine310/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.9
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine310/test-deps/meta.json b/release/preview/alpine310/test-deps/meta.json
deleted file mode 100644
index e9d691b94..000000000
--- a/release/preview/alpine310/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.10",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 296
-    },
-    "TagMapping": {
-        "^.*-alpine-3.10$" : "preview-alpine-3.10"
-    }
-}
diff --git a/release/stable/alpine310/dependabot/Dockerfile b/release/stable/alpine310/dependabot/Dockerfile
deleted file mode 100644
index cf983a1b7..000000000
--- a/release/stable/alpine310/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.10.0
diff --git a/release/stable/alpine310/docker/Dockerfile b/release/stable/alpine310/docker/Dockerfile
deleted file mode 100644
index f27f52237..000000000
--- a/release/stable/alpine310/docker/Dockerfile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.x image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.10 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.10
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.10
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine310/meta.json b/release/stable/alpine310/meta.json
deleted file mode 100644
index 5562cee04..000000000
--- a/release/stable/alpine310/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.10",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "#psversion#-alpine-3.10-#fulltag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.10"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 225
-    }
-}
diff --git a/release/stable/alpine310/test-deps/docker/Dockerfile b/release/stable/alpine310/test-deps/docker/Dockerfile
deleted file mode 100644
index 3e3fd4ece..000000000
--- a/release/stable/alpine310/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.9
-
-FROM node:14.3.0-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.9
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine310/test-deps/meta.json b/release/stable/alpine310/test-deps/meta.json
deleted file mode 100644
index 700fb5195..000000000
--- a/release/stable/alpine310/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.10",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 296
-    },
-    "TagMapping": {
-        "^.*-alpine-3.10$" : "alpine-3.10"
-    }
-}
diff --git a/tools/.gitpod.Dockerfile b/tools/.gitpod.Dockerfile
index a2b460760..cd8230be3 100644
--- a/tools/.gitpod.Dockerfile
+++ b/tools/.gitpod.Dockerfile
@@ -2,6 +2,4 @@ FROM mcr.microsoft.com/powershell:latest
 
 USER root
 
-RUN apt-get update \
-    && apt-get --yes install docker \
-    && pwsh -NoLogo -NoProfile -c "Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99"
+RUN pwsh -NoLogo -NoProfile -c "Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99"

From d08ed574fcff249e75e4bc56d60966075a623238 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 14:50:05 -0800
Subject: [PATCH 121/354] Bump oraclelinux from 8.2 to 8.3 in
 /release/community-stable/oraclelinux/docker (#522)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/community-stable/oraclelinux/docker/Dockerfile | 4 ++--
 release/community-stable/oraclelinux/meta.json         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile
index 27a638648..6bbb0dc14 100644
--- a/release/community-stable/oraclelinux/docker/Dockerfile
+++ b/release/community-stable/oraclelinux/docker/Dockerfile
@@ -5,7 +5,7 @@
 # installed from RHEL7 PowerShell package
 
 # Define arg(s) needed for the From statement
-FROM oraclelinux:8.2 AS installer-env
+FROM oraclelinux:8.3 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
@@ -22,7 +22,7 @@ ENV \
     LANG=en_US.UTF-8 \
     # Set up PowerShell module analysis cache path
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache  \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-8.2
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-8.3
 
 # Installation
 RUN \
diff --git a/release/community-stable/oraclelinux/meta.json b/release/community-stable/oraclelinux/meta.json
index a2f4b5258..aeb76d4a2 100644
--- a/release/community-stable/oraclelinux/meta.json
+++ b/release/community-stable/oraclelinux/meta.json
@@ -3,7 +3,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "SkipGssNtlmSspTests": false,
     "shortTags": [
-        {"Tag": "8.2"}
+        {"Tag": "8.3"}
     ],
     "tagTemplates": [
         "#psversion#-oraclelinux-#shorttag#",

From 21fa33d6973ef03f7c5a7e031ee16ad267bd8624 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 21 Jan 2021 15:16:10 -0800
Subject: [PATCH 122/354] Generate and release manifest lists based on meta
 json (#529)

---
 .vsts-ci/manifestSteps.yml                    |  2 +-
 .../releaseManifestList.yml                   | 88 ++++++++++++++++++
 .../templatesReleasePipeline/releaseStage.yml |  7 ++
 build.ps1                                     | 88 +++++++++++++++++-
 createAllManifests.ps1                        | 80 +++++++++++++----
 createManifest.ps1                            | 17 +++-
 release/lts/nanoserver1903/docker/Dockerfile  | 89 ------------------
 release/lts/nanoserver1903/meta.json          | 19 ----
 .../windowsservercore1903/docker/Dockerfile   | 67 --------------
 release/lts/windowsservercore1903/meta.json   | 19 ----
 .../preview/nanoserver1903/docker/Dockerfile  | 87 ------------------
 release/preview/nanoserver1903/meta.json      | 20 -----
 release/preview/ubuntu20.04/meta.json         |  3 +
 .../preview/windowsservercore1809/meta.json   |  3 +
 .../windowsservercore1903/docker/Dockerfile   | 67 --------------
 .../preview/windowsservercore1903/meta.json   | 20 -----
 .../preview/windowsservercore1909/meta.json   |  3 +
 .../preview/windowsservercore2004/meta.json   |  3 +
 release/stable/nanoserver1809/meta.json       |  3 +
 .../stable/nanoserver1903/docker/Dockerfile   | 90 -------------------
 release/stable/nanoserver1903/meta.json       | 20 -----
 release/stable/nanoserver1909/meta.json       |  3 +
 release/stable/nanoserver2004/meta.json       |  3 +
 release/stable/ubuntu20.04/meta.json          |  3 +
 .../stable/windowsservercore1809/meta.json    |  3 +
 .../windowsservercore1903/docker/Dockerfile   | 70 ---------------
 .../stable/windowsservercore1903/meta.json    | 20 -----
 .../stable/windowsservercore1909/meta.json    |  3 +
 .../stable/windowsservercore2004/meta.json    |  3 +
 tools/buildHelper/buildHelper.psm1            |  3 +
 30 files changed, 291 insertions(+), 615 deletions(-)
 create mode 100644 .vsts-ci/templatesReleasePipeline/releaseManifestList.yml
 delete mode 100644 release/lts/nanoserver1903/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver1903/meta.json
 delete mode 100644 release/lts/windowsservercore1903/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore1903/meta.json
 delete mode 100644 release/preview/nanoserver1903/docker/Dockerfile
 delete mode 100644 release/preview/nanoserver1903/meta.json
 delete mode 100644 release/preview/windowsservercore1903/docker/Dockerfile
 delete mode 100644 release/preview/windowsservercore1903/meta.json
 delete mode 100644 release/stable/nanoserver1903/docker/Dockerfile
 delete mode 100644 release/stable/nanoserver1903/meta.json
 delete mode 100644 release/stable/windowsservercore1903/docker/Dockerfile
 delete mode 100644 release/stable/windowsservercore1903/meta.json

diff --git a/.vsts-ci/manifestSteps.yml b/.vsts-ci/manifestSteps.yml
index 4b0c6c8c8..f1e1b08e2 100644
--- a/.vsts-ci/manifestSteps.yml
+++ b/.vsts-ci/manifestSteps.yml
@@ -20,7 +20,7 @@ steps:
 - powershell: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
   displayName: 'docker login'
 
-- powershell: |
+- pwsh: |
       if($env:$(Channel) -eq 'true')
       {
         ./createAllManifests.ps1 -Registry '$(dockerHost)/$(dockerNamespace)' -Channel $(Channel)
diff --git a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
new file mode 100644
index 000000000..99709e859
--- /dev/null
+++ b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
@@ -0,0 +1,88 @@
+parameters:
+  vmImage: 'ubuntu-16.04'
+  jobName: 'none'
+  releaseTag: ''
+  ACR: 'no'
+  maxParallel: 5
+  dependsOn: []
+  channel: STABLE
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    dependsOn:
+      ${{ parameters.dependsOn }}
+    variables:
+      - group: 'Staging_ACR'
+      - name: 'dockerImage'
+        value: 'powershell'
+      - name: "Channel"
+        value: ${{ parameters.channel }}
+      - name: "ACR"
+        value: ${{ parameters.ACR }}
+      - name: "releaseTag"
+        value: ${{ parameters.releaseTag }}
+
+    pool:
+      vmImage: ${{ parameters.vmImage }}
+    timeoutInMinutes: 30
+
+    displayName: ${{ parameters.jobName }}
+
+    steps:
+    - download: releasePipeline
+      displayName: Download build meta json
+      artifact: buildMeta
+      patterns: '**/*.json'
+
+    - download: releasePipeline
+      displayName: Download release tags json
+      artifact: releaseTags
+      patterns: '**/*.json'
+    - pwsh: |
+            $json = Get-ChildItem "$ENV:PIPELINE_WORKSPACE/buildmeta.json" -recurse -File
+            if($json.Count -ge 1)
+            {
+                $jsonText = Get-Content -Path $json.FullName
+                $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+                Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+                Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+            }
+            else{
+                Write-Verbose "Did not find buildmeta json" -verbose
+            }
+      displayName: 'Set Full Tag'
+
+    - task: PowerShell@2
+      displayName: 'Deserialize Release Tags'
+      inputs:
+        targetType: 'filePath'
+        filePath: .vsts-ci/templatesGeneric/deserializeTags.ps1
+        pwsh: true
+
+    - template: ../templatesGeneric/setVersionStepsTemplate.yml
+
+    - pwsh: |
+        Get-ChildItem env: | Out-String -Width 1000
+      displayName: 'Capture Environment'
+
+    - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+      displayName: 'az login'
+
+    - pwsh: |
+            az account set --subscription $(AcrSubscriptionName)
+            $manifestLists = ./build.ps1 -GenerateManifestLists -Channel $(channel) -OsFilter All  | convertfrom-json
+            $repos = @($manifestLists.Repo)
+
+            foreach($repo in $repos) {
+              foreach($tag in ($manifestLists | where-object {$_.repo -eq $repo}).ManifestList) {
+                $name = $repo + ":" + $tag
+                $stagingRepo = $repo -replace 'public/', '$(dockerNamespace)/'
+                Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
+                az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+              }
+            }
+      displayName: 'release - $(channel) - $(imagename)'
+
+    - pwsh: 'az logout'
+      displayName: 'az logout'
+      condition: always()
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index d56aeba5a..cbbdf417d 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -44,3 +44,10 @@ stages:
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
+
+    - stage: Release_ManifestList_${{ parameters.channel }}
+      jobs:
+      - template: ./releaseManifestList.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_manifest_list
+          channel: ${{ parameters.channel }}
diff --git a/build.ps1 b/build.ps1
index 06979a3c6..65f90f037 100755
--- a/build.ps1
+++ b/build.ps1
@@ -34,6 +34,10 @@ param(
     [switch]
     $GenerateMatrixJson,
 
+    [Parameter(Mandatory, ParameterSetName="GenerateManifestLists")]
+    [switch]
+    $GenerateManifestLists,
+
     [Parameter(Mandatory, ParameterSetName="GenerateTagsYaml")]
     [switch]
     $GenerateTagsYaml,
@@ -93,6 +97,7 @@ param(
     [Parameter(Mandatory, ParameterSetName="DupeCheckAll")]
     [Parameter(Mandatory, ParameterSetName="GenerateTagsYaml")]
     [Parameter(Mandatory, ParameterSetName="GenerateMatrixJson")]
+    [Parameter(Mandatory, ParameterSetName="GenerateManifestLists")]
     [string[]]
     $Channel='stable',
 
@@ -113,6 +118,7 @@ param(
     $Version,
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
@@ -124,12 +130,14 @@ param(
     [string]
     $LtsVersion,
 
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
     $PreviewVersion,
 
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -147,11 +155,13 @@ param(
     [switch]
     $ForcePesterInstall,
 
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [string]
     [ValidateSet('All','OnlyAcr','NoAcr')]
     $Acr,
 
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [string]
     [ValidateSet('All','Linux','Windows')]
@@ -208,7 +218,7 @@ DynamicParam {
 }
 
 Begin {
-    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll' -and $Channel.Count -gt 1)
+    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
     }
@@ -368,7 +378,7 @@ End {
                     }
                 }
             }
-            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent) {
+            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent -or $GenerateManifestLists.IsPresent) {
                 if($Acr -eq 'OnlyAcr' -and !$useAcr)
                 {
                     continue
@@ -395,12 +405,13 @@ End {
 
                 $architecture = 'amd64'
                 $imagePath = $allMeta.imagePath
-                $relativeImagePath = $imagePath -replace $PSScriptRoot
+                $relativeImagePath = $imagePath.Replace($PSScriptRoot,'')
                 $relativeImagePath = $relativeImagePath -replace '\\', '/'
                 $dockerfile = "https://github.com/PowerShell/PowerShell-Docker/blob/master$relativeImagePath/docker/Dockerfile"
 
                 $osVersion = $allMeta.meta.osVersion
-                if($osVersion -or $GenerateMatrixJson.IsPresent)
+                $manifestLists = $allMeta.meta.ManifestLists
+                if($osVersion -or $GenerateMatrixJson.IsPresent -or $GenerateManifestLists.IsPresent)
                 {
                     if ($osVersion) {
                         $osVersion = $osVersion.replace('${fromTag}', $actualTagData.fromTag)
@@ -425,6 +436,7 @@ End {
                         Name            = $dockerFileName
                         UseAcr          = $UseAcr
                         ContinueOnError = $continueOnError
+                        ManifestLists   = $manifestLists
                     }
 
                     $tagGroups[$tagGroup] += $tag
@@ -583,6 +595,74 @@ End {
         }
     }
 
+    if ($GenerateManifestLists.IsPresent) {
+        $manifestLists = @()
+        $tags = @()
+        foreach ($repo in $tagGroups.Keys | Sort-Object) {
+            $channelGroups = $tagGroups.$repo | Group-Object -Property Channel
+            foreach ($channelGroup in $channelGroups) {
+                $channelName = $channelGroup.Name
+                Write-Verbose "generating $channelName json"
+                $osGroups = $channelGroup.Group | Group-Object -Property os
+                foreach ($osGroup in $osGroups) {
+                    $osName = $osGroup.Name
+
+                    # Filter out subimages.  We cannot directly build subimages.
+                    foreach ($tag in $osGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property ManifestLists) {
+                        if ($tag.ManifestLists) {
+                            foreach ($manifestList in $tag.ManifestLists) {
+
+                                if ($manifestLists -notcontains $manifestList) {
+                                    $manifestLists += $manifestList
+                                }
+
+                                $tag | Add-Member -MemberType NoteProperty -Value $repo -Name 'Repo'
+
+                                $tags += $tag
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        $matrix = @{}
+        foreach ($manifestList in $manifestLists) {
+            $jobName = $manifestList -replace '-', '_'
+            $manifestListTags = [PSCustomObject]@{
+                ManifestList = $manifestList
+                Channel      = ""
+                Tags         = @()
+                JobName      = $jobName
+                Repo         = ""
+            }
+
+            foreach ($tag in $tags | Where-Object { $_.ManifestLists -contains $manifestList }) {
+                if (-not $matrix.ContainsKey($manifestList)) {
+                    $matrix.Add($manifestList, @{ })
+                }
+
+                $manifestListTags.Channel = $tag.Channel
+                $manifestListTags.Tags += $tag.Tags | Where-Object { $_ -notmatch '\d{8}' } | Select-Object -First 1
+                $manifestListTags.Repo = $tag.Repo
+            }
+
+            if (-not $matrix.$manifestList.ContainsKey($jobName) -and -not $tag.ContinueOnError) {
+                $matrix.$manifestList.Add($jobName, $manifestListTags)
+            }
+        }
+
+        foreach ($manifestList in $matrix.Keys) {
+            foreach ($jobName in $matrix.$manifestList.Keys) {
+                $jobMatrix = $matrix.$manifestList.$jobName
+                $matrixJson = $jobMatrix | ConvertTo-Json -Compress
+                Write-Output $matrixJson
+            }
+        }
+
+        exit 0
+    }
+
     if($CheckForDuplicateTags.IsPresent)
     {
         if($dupeTagIssues.count -gt 0)
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index ae02fde64..dc0a19576 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # script to create the Docker manifest lists
@@ -10,29 +10,71 @@ param (
     [ValidateSet('stable','preview','servicing')]
     [Parameter(Mandatory)]
     [string]
-    $Channel='stable'
+    $Channel='stable',
+
+    [switch]
+    $SkipPush
 )
 
-$createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
+# this function wraps native command Execution
+# for more information, read https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
+function script:Start-NativeExecution
+{
+    param(
+        [scriptblock]$sb,
+        [switch]$IgnoreExitcode,
+        [switch]$VerboseOutputOnError
+    )
 
-$latestStableUbuntu   = "ubuntu-bionic"
-$latestStableWsc1809  = "windowsservercore-1809"
-$latestStableWsc1903  = "windowsservercore-1903"
-$latestStableNano1809 = "nanoserver-1809"
-$latestStableNano1903 = "nanoserver-1903"
+    Write-Verbose -Message "Running '$($sb.ToString())'" -Verbose
+    $backupEAP = $ErrorActionPreference
+    $ErrorActionPreference = "Continue"
+    try {
+        if($VerboseOutputOnError.IsPresent)
+        {
+            $output = & $sb 2>&1
+        }
+        else
+        {
+            & $sb
+        }
 
-$latestPreviewUbuntu  = "preview-ubuntu-bionic"
-$latestPreviewWsc1809 = "preview-windowsservercore-1809"
-$latestPreviewWsc1903 = "preview-windowsservercore-1809"
+        # note, if $sb doesn't have a native invocation, $LASTEXITCODE will
+        # point to the obsolete value
+        if ($LASTEXITCODE -ne 0 -and -not $IgnoreExitcode) {
+            if($VerboseOutputOnError.IsPresent -and $output)
+            {
+                $output | Out-String | Write-Verbose -Verbose
+            }
 
-switch ($Channel)
-{
-    'preview' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWsc1809 -ManifestTag 'preview'
-    }
+            # Get caller location for easier debugging
+            $caller = Get-PSCallStack -ErrorAction SilentlyContinue
+            if($caller)
+            {
+                $callerLocationParts = $caller[1].Location -split ":\s*line\s*"
+                $callerFile = $callerLocationParts[0]
+                $callerLine = $callerLocationParts[1]
 
-    'stable' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWsc1809 -ManifestTag 'latest'
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1809 -ManifestTag 'nanoserver'
+                $errorMessage = "Execution of {$sb} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
+                throw $errorMessage
+            }
+            throw "Execution of {$sb} failed with exit code $LASTEXITCODE"
+        }
+    } finally {
+        $ErrorActionPreference = $backupEAP
     }
 }
+
+$buildScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'build.ps1'
+
+$createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
+
+$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All"))
+
+$manifestLists = $json | ConvertFrom-Json
+
+$manifestLists.ManifestList | ForEach-Object {
+    $tag = $_
+    $manifestList = $manifestLists | Where-Object {$_.ManifestList -eq $tag}
+    Start-NativeExecution -sb ([scriptblock]::Create("$createScriptPath -ContainerRegistry $Registry -taglist $($manifestList.Tags -join ', ') -ManifestTag $tag -SkipPush:`$$($SkipPush.IsPresent)"))
+}
diff --git a/createManifest.ps1 b/createManifest.ps1
index e250e1429..21c2bea2b 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Used to create a container manifest.
@@ -23,7 +23,11 @@ param(
     [ValidateNotNullOrEmpty()]
     [ValidatePattern('^[abcdefghijklmnopqrstuvwxyz\-_0123456789\.]+$')]
     [string[]]
-    $TagList = ('ubuntu-16.04', 'windowsservercore')
+    $TagList = ('ubuntu-16.04', 'windowsservercore'),
+
+    [switch]
+    $SkipPush
+
 )
 
 $first = $true
@@ -46,4 +50,11 @@ foreach($tag in $TagList)
 docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag
 
 # push the manifest
-docker manifest push --purge $ContainerRegistry/${Image}:$ManifestTag
+if (-not $SkipPush) {
+    Write-Verbose -Message 'pushing manifest list...' -Verbose
+    docker manifest push --purge $ContainerRegistry/${Image}:$ManifestTag
+}
+else {
+    Write-Verbose -Message 'skipping manifest list push...' -Verbose
+
+}
diff --git a/release/lts/nanoserver1903/docker/Dockerfile b/release/lts/nanoserver1903/docker/Dockerfile
deleted file mode 100644
index e4ff0d63b..000000000
--- a/release/lts/nanoserver1903/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1903
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1903/meta.json b/release/lts/nanoserver1903/meta.json
deleted file mode 100644
index 346f7c977..000000000
--- a/release/lts/nanoserver1903/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-1903-#fulltag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/lts/windowsservercore1903/docker/Dockerfile b/release/lts/windowsservercore1903/docker/Dockerfile
deleted file mode 100644
index c93030585..000000000
--- a/release/lts/windowsservercore1903/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1903 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1903
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore1903/meta.json b/release/lts/windowsservercore1903/meta.json
deleted file mode 100644
index 7047f3cc3..000000000
--- a/release/lts/windowsservercore1903/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-1903-#fulltag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/preview/nanoserver1903/docker/Dockerfile b/release/preview/nanoserver1903/docker/Dockerfile
deleted file mode 100644
index d10cb09f6..000000000
--- a/release/preview/nanoserver1903/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1903
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver1903/meta.json b/release/preview/nanoserver1903/meta.json
deleted file mode 100644
index 70847a159..000000000
--- a/release/preview/nanoserver1903/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1903-#fulltag#",
-        "preview-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
index 59fb5b571..1be304b2c 100644
--- a/release/preview/ubuntu20.04/meta.json
+++ b/release/preview/ubuntu20.04/meta.json
@@ -13,6 +13,9 @@
         {"Tag": "focal"},
         {"Tag": "20.04"}
     ],
+    "manifestLists": [
+        "preview"
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/preview/windowsservercore1809/meta.json b/release/preview/windowsservercore1809/meta.json
index 24424e59c..532557572 100644
--- a/release/preview/windowsservercore1809/meta.json
+++ b/release/preview/windowsservercore1809/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-1809-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "preview"
+    ],
     "TestProperties": {
         "size": 1
     }
diff --git a/release/preview/windowsservercore1903/docker/Dockerfile b/release/preview/windowsservercore1903/docker/Dockerfile
deleted file mode 100644
index 10163b54f..000000000
--- a/release/preview/windowsservercore1903/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1903 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1903
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore1903/meta.json b/release/preview/windowsservercore1903/meta.json
deleted file mode 100644
index cb6e97ffb..000000000
--- a/release/preview/windowsservercore1903/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1903-#fulltag#",
-        "preview-windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/preview/windowsservercore1909/meta.json b/release/preview/windowsservercore1909/meta.json
index 3816987c3..24753388f 100644
--- a/release/preview/windowsservercore1909/meta.json
+++ b/release/preview/windowsservercore1909/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-1909-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "preview"
+    ],
     "TestProperties": {
         "size": 1
     },
diff --git a/release/preview/windowsservercore2004/meta.json b/release/preview/windowsservercore2004/meta.json
index 3480b2b4f..b855e3958 100644
--- a/release/preview/windowsservercore2004/meta.json
+++ b/release/preview/windowsservercore2004/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-2004-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "preview"
+    ],
     "TestProperties": {
         "size": 1
     },
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index 9ed505979..e6bd7be2b 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -12,6 +12,9 @@
         "#psversion#-nanoserver-1809-#fulltag#",
         "nanoserver-#shorttag#"
     ],
+    "manifestLists": [
+        "nanoserver"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/stable/nanoserver1903/docker/Dockerfile b/release/stable/nanoserver1903/docker/Dockerfile
deleted file mode 100644
index 0842a49a9..000000000
--- a/release/stable/nanoserver1903/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1903
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1903"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver1903/meta.json b/release/stable/nanoserver1903/meta.json
deleted file mode 100644
index 144509755..000000000
--- a/release/stable/nanoserver1903/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1903-#fulltag#",
-        "nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/stable/nanoserver1909/meta.json b/release/stable/nanoserver1909/meta.json
index 167c4cd00..64a57cf93 100644
--- a/release/stable/nanoserver1909/meta.json
+++ b/release/stable/nanoserver1909/meta.json
@@ -12,6 +12,9 @@
         "#psversion#-nanoserver-1909-#fulltag#",
         "nanoserver-#shorttag#"
     ],
+    "manifestLists": [
+        "nanoserver"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/stable/nanoserver2004/meta.json b/release/stable/nanoserver2004/meta.json
index fa6f042a6..4e891438e 100644
--- a/release/stable/nanoserver2004/meta.json
+++ b/release/stable/nanoserver2004/meta.json
@@ -12,6 +12,9 @@
         "#psversion#-nanoserver-2004-#fulltag#",
         "nanoserver-#shorttag#"
     ],
+    "manifestLists": [
+        "nanoserver"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/stable/ubuntu20.04/meta.json b/release/stable/ubuntu20.04/meta.json
index 77f542929..f3d26f4bb 100644
--- a/release/stable/ubuntu20.04/meta.json
+++ b/release/stable/ubuntu20.04/meta.json
@@ -13,6 +13,9 @@
         {"Tag": "focal"},
         {"Tag": "20.04"}
     ],
+    "manifestLists": [
+        "latest"
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/stable/windowsservercore1809/meta.json b/release/stable/windowsservercore1809/meta.json
index 8daea2fb2..c3eec7d75 100644
--- a/release/stable/windowsservercore1809/meta.json
+++ b/release/stable/windowsservercore1809/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-1809-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "latest"
+    ],
     "TestProperties": {
         "size": 1
     }
diff --git a/release/stable/windowsservercore1903/docker/Dockerfile b/release/stable/windowsservercore1903/docker/Dockerfile
deleted file mode 100644
index 3921a3a76..000000000
--- a/release/stable/windowsservercore1903/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1903 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1903
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1903" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore1903/meta.json b/release/stable/windowsservercore1903/meta.json
deleted file mode 100644
index 60c239653..000000000
--- a/release/stable/windowsservercore1903/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1903",
-    "shortTags": [
-        {
-            "Tag": "1903"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1903-#fulltag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/stable/windowsservercore1909/meta.json b/release/stable/windowsservercore1909/meta.json
index 5e27182bd..fab03b5e4 100644
--- a/release/stable/windowsservercore1909/meta.json
+++ b/release/stable/windowsservercore1909/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-1909-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "latest"
+    ],
     "TestProperties": {
         "size": 1
     },
diff --git a/release/stable/windowsservercore2004/meta.json b/release/stable/windowsservercore2004/meta.json
index d6ff9a9d3..3df98f9c3 100644
--- a/release/stable/windowsservercore2004/meta.json
+++ b/release/stable/windowsservercore2004/meta.json
@@ -13,6 +13,9 @@
         "#psversion#-windowsservercore-2004-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
+    "manifestLists": [
+        "latest"
+    ],
     "TestProperties": {
         "size": 1
     },
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 8fba43ad2..1486cb93c 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -189,6 +189,9 @@ class DockerImageMetaData {
 
     [bool]
     $ContinueOnError = $false
+
+    [string]
+    $ManifestLists = @()
 }
 
 class ShortTagMetaData {

From bf77014c8093030149cf0d688e833507bba3bcff Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sat, 23 Jan 2021 11:37:03 -0800
Subject: [PATCH 123/354] End of life Windows Server Core 1809 (#531)

---
 .../windowsservercore1809/docker/Dockerfile   | 67 ------------------
 release/lts/windowsservercore1809/meta.json   | 18 -----
 .../windowsservercore1809/docker/Dockerfile   | 67 ------------------
 .../preview/windowsservercore1809/meta.json   | 22 ------
 .../windowsservercore1809/docker/Dockerfile   | 70 -------------------
 .../stable/windowsservercore1809/meta.json    | 22 ------
 6 files changed, 266 deletions(-)
 delete mode 100644 release/lts/windowsservercore1809/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore1809/meta.json
 delete mode 100644 release/preview/windowsservercore1809/docker/Dockerfile
 delete mode 100644 release/preview/windowsservercore1809/meta.json
 delete mode 100644 release/stable/windowsservercore1809/docker/Dockerfile
 delete mode 100644 release/stable/windowsservercore1809/meta.json

diff --git a/release/lts/windowsservercore1809/docker/Dockerfile b/release/lts/windowsservercore1809/docker/Dockerfile
deleted file mode 100644
index cd7a9321a..000000000
--- a/release/lts/windowsservercore1809/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1809 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1809
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore1809/meta.json b/release/lts/windowsservercore1809/meta.json
deleted file mode 100644
index 7c86a28c5..000000000
--- a/release/lts/windowsservercore1809/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1809",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-1809-#fulltag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/preview/windowsservercore1809/docker/Dockerfile b/release/preview/windowsservercore1809/docker/Dockerfile
deleted file mode 100644
index 6b0568fd9..000000000
--- a/release/preview/windowsservercore1809/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1809 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1809
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore1809/meta.json b/release/preview/windowsservercore1809/meta.json
deleted file mode 100644
index 532557572..000000000
--- a/release/preview/windowsservercore1809/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1809",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1809-#fulltag#",
-        "preview-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "preview"
-    ],
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/stable/windowsservercore1809/docker/Dockerfile b/release/stable/windowsservercore1809/docker/Dockerfile
deleted file mode 100644
index c27d0f572..000000000
--- a/release/stable/windowsservercore1809/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1809 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1809
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1809" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore1809/meta.json b/release/stable/windowsservercore1809/meta.json
deleted file mode 100644
index c3eec7d75..000000000
--- a/release/stable/windowsservercore1809/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1809",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1809-#fulltag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    }
-}

From f81b2419b7af1e4d919db7029ee8b91a0989292d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sun, 24 Jan 2021 10:37:47 -0800
Subject: [PATCH 124/354] Remove remaining getlatesttag.ps1 files (#533)

* remove remaining getlatesttag.ps1 files

* remove the last fromTag in a  Dockerfile that is used
---
 release/lts/arm32v7/docker/Dockerfile              |  6 ++----
 release/lts/arm32v7/getLatestTag.ps1               | 14 --------------
 release/lts/arm32v7/meta.json                      |  3 +++
 release/lts/centos7/docker/Dockerfile              | 12 ++++--------
 release/lts/centos7/getLatestTag.ps1               | 14 --------------
 release/lts/centos7/meta.json                      |  3 +++
 release/lts/centos8/docker/Dockerfile              | 12 ++++--------
 release/lts/centos8/getLatestTag.ps1               | 14 --------------
 release/lts/centos8/meta.json                      |  3 +++
 release/lts/ubuntu16.04/docker/Dockerfile          |  7 ++++---
 release/lts/ubuntu16.04/getLatestTag.ps1           | 14 --------------
 release/lts/ubuntu16.04/meta.json                  |  6 +++++-
 release/lts/ubuntu18.04/docker/Dockerfile          |  9 +++++----
 release/lts/ubuntu18.04/getLatestTag.ps1           | 14 --------------
 release/lts/ubuntu18.04/meta.json                  |  4 ++++
 release/stable/centos8/docker/Dockerfile           |  1 -
 release/stable/centos8/meta.json                   |  2 +-
 .../stable/ubuntu18.04/test-deps/docker/Dockerfile |  2 ++
 release/unstable/clearlinux/docker/Dockerfile      |  4 ++--
 19 files changed, 42 insertions(+), 102 deletions(-)
 delete mode 100644 release/lts/arm32v7/getLatestTag.ps1
 delete mode 100644 release/lts/centos7/getLatestTag.ps1
 delete mode 100644 release/lts/centos8/getLatestTag.ps1
 delete mode 100644 release/lts/ubuntu16.04/getLatestTag.ps1
 delete mode 100644 release/lts/ubuntu18.04/getLatestTag.ps1

diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
index f798e2164..f03a9a6cf 100644
--- a/release/lts/arm32v7/docker/Dockerfile
+++ b/release/lts/arm32v7/docker/Dockerfile
@@ -1,10 +1,8 @@
 # Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
-ARG fromTag=bionic
-ARG imageRepo=arm32v7/ubuntu
+FROM arm32v7/ubuntu:bionic AS installer-env
 
-FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -39,7 +37,7 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM ${imageRepo}:${fromTag} AS final-image
+FROM arm32v7/ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-lts
diff --git a/release/lts/arm32v7/getLatestTag.ps1 b/release/lts/arm32v7/getLatestTag.ps1
deleted file mode 100644
index 211008454..000000000
--- a/release/lts/arm32v7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04'
diff --git a/release/lts/arm32v7/meta.json b/release/lts/arm32v7/meta.json
index 04ec4545c..5c7bf10f8 100644
--- a/release/lts/arm32v7/meta.json
+++ b/release/lts/arm32v7/meta.json
@@ -9,6 +9,9 @@
     "tagTemplates": [
         "lts-arm32v7-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 550,
         "Arm32": true
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index 42b4f4624..a661a118e 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=7
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:7 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
diff --git a/release/lts/centos7/getLatestTag.ps1 b/release/lts/centos7/getLatestTag.ps1
deleted file mode 100644
index 2d9d1ce17..000000000
--- a/release/lts/centos7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('7')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^7$' -OnlyShortTags
diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
index cac25f71f..689baf1a3 100644
--- a/release/lts/centos7/meta.json
+++ b/release/lts/centos7/meta.json
@@ -6,6 +6,9 @@
     "tagTemplates": [
         "lts-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "7"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 550
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index 54941dd10..57dd452e5 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=8
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
diff --git a/release/lts/centos8/getLatestTag.ps1 b/release/lts/centos8/getLatestTag.ps1
deleted file mode 100644
index 7de27c1c3..000000000
--- a/release/lts/centos8/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('8')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^8$' -OnlyShortTags
diff --git a/release/lts/centos8/meta.json b/release/lts/centos8/meta.json
index c1dece5f7..6b7fdccd7 100644
--- a/release/lts/centos8/meta.json
+++ b/release/lts/centos8/meta.json
@@ -6,6 +6,9 @@
     "tagTemplates": [
         "lts-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "8"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 725
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index e0b928a26..7bb04918c 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -1,8 +1,9 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=16.04
-ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
diff --git a/release/lts/ubuntu16.04/getLatestTag.ps1 b/release/lts/ubuntu16.04/getLatestTag.ps1
deleted file mode 100644
index ed6a85150..000000000
--- a/release/lts/ubuntu16.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the xenial image on
-
-# The versions of xenial we care about
-$shortTags = @('xenial')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'xenial-\d{8}[\.\d{1}]?' -AlternativeShortTag '16.04'
diff --git a/release/lts/ubuntu16.04/meta.json b/release/lts/ubuntu16.04/meta.json
index 3b9123fa4..f4fb847b9 100644
--- a/release/lts/ubuntu16.04/meta.json
+++ b/release/lts/ubuntu16.04/meta.json
@@ -3,10 +3,14 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
-    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "xenial"},
+        {"Tag": "16.04"}
+    ],
+    "SkipGssNtlmSspTests": false,
     "TestProperties": {
         "size": 395
     },
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 228cd239c..149833278 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -1,9 +1,10 @@
-# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=18.04
-ARG imageRepo=ubuntu
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:18.04 AS installer-env
 
+# Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
diff --git a/release/lts/ubuntu18.04/getLatestTag.ps1 b/release/lts/ubuntu18.04/getLatestTag.ps1
deleted file mode 100644
index 162b83cde..000000000
--- a/release/lts/ubuntu18.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the beaver image on
-
-# The versions of beaver we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'bionic-\d{8}[\.\d{1}]?' -AlternativeShortTag '18.04'
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
index 247c127a5..e6eab0961 100644
--- a/release/lts/ubuntu18.04/meta.json
+++ b/release/lts/ubuntu18.04/meta.json
@@ -7,6 +7,10 @@
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
+    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index 48575c79e..ce04aa199 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -34,7 +34,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
-    # && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
index 6ae835c9b..b83c1c7ec 100644
--- a/release/stable/centos8/meta.json
+++ b/release/stable/centos8/meta.json
@@ -12,6 +12,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 723
+        "size": 725
     }
 }
diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
index 092229f24..47e76069d 100644
--- a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile
@@ -14,6 +14,8 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
+
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]
diff --git a/release/unstable/clearlinux/docker/Dockerfile b/release/unstable/clearlinux/docker/Dockerfile
index 00c42babb..b26fcd4c8 100644
--- a/release/unstable/clearlinux/docker/Dockerfile
+++ b/release/unstable/clearlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Intel Clear Linux image with PowerShell
@@ -26,7 +26,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
     # Opt out of SocketsHttpHandler in DotNet Core 2.1 to use HttpClientHandler
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux
 
 # Installation
 RUN \

From e0bc443c85528270a7590e5e612a0d475a6c0cd7 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Sun, 24 Jan 2021 20:49:01 -0500
Subject: [PATCH 125/354] Add LTS tag and push manifest lists for LTS (#532)

Co-authored-by: Travis Plunk <travis@ez13.net>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/manifestSteps.yml                  |  7 -------
 .vsts-ci/releasebuild.yml                   | 14 ++++++++++++++
 build.ps1                                   |  1 +
 createAllManifests.ps1                      |  2 +-
 release/lts/nanoserver1809/meta.json        |  3 +++
 release/lts/nanoserver1909/meta.json        |  3 +++
 release/lts/nanoserver2004/meta.json        |  3 +++
 release/lts/ubuntu18.04/meta.json           |  3 +++
 release/lts/windowsservercore1909/meta.json |  3 +++
 release/lts/windowsservercore2004/meta.json |  3 +++
 10 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.vsts-ci/manifestSteps.yml b/.vsts-ci/manifestSteps.yml
index f1e1b08e2..177bea898 100644
--- a/.vsts-ci/manifestSteps.yml
+++ b/.vsts-ci/manifestSteps.yml
@@ -21,14 +21,7 @@ steps:
   displayName: 'docker login'
 
 - pwsh: |
-      if($env:$(Channel) -eq 'true')
-      {
         ./createAllManifests.ps1 -Registry '$(dockerHost)/$(dockerNamespace)' -Channel $(Channel)
-      }
-      else
-      {
-        Write-Host 'Current channel disabled, skipping ...'
-      }
   displayName: 'Create $(Channel) Manifest Lists'
 
 - powershell: 'docker logout $(dockerHost)'
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 358af8467..ba90bbe90 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -58,6 +58,20 @@ stages:
       steps:
       - template: manifestSteps.yml
 
+    - job: LtsManifestPhase
+      variables:
+        releaseTag: $(ltsReleaseTag)
+        channel: LTS
+
+      displayName: Create Lts Manifest Lists
+      condition: succeededOrFailed()
+      pool:
+        vmImage: windows-latest
+        timeoutInMinutes: 30
+
+      steps:
+      - template: manifestSteps.yml
+
     - job: StableManifestPhase
       variables:
         releaseTag: $(stableReleaseTag)
diff --git a/build.ps1 b/build.ps1
index 65f90f037..f484edd8e 100755
--- a/build.ps1
+++ b/build.ps1
@@ -125,6 +125,7 @@ param(
     $StableVersion,
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index dc0a19576..d9c0b6e92 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -7,7 +7,7 @@ param (
     [string]
     $Registry = 'microsoft',
 
-    [ValidateSet('stable','preview','servicing')]
+    [ValidateSet('stable','preview','servicing', 'lts')]
     [Parameter(Mandatory)]
     [string]
     $Channel='stable',
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
index 207767dc9..c15ddca9d 100644
--- a/release/lts/nanoserver1809/meta.json
+++ b/release/lts/nanoserver1809/meta.json
@@ -11,6 +11,9 @@
         "lts-nanoserver-#shorttag#",
         "lts-nanoserver-1809-#fulltag#"
     ],
+    "manifestLists": [
+        "nanoserver-lts"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/lts/nanoserver1909/meta.json b/release/lts/nanoserver1909/meta.json
index 2745eef93..685e8675f 100644
--- a/release/lts/nanoserver1909/meta.json
+++ b/release/lts/nanoserver1909/meta.json
@@ -11,6 +11,9 @@
         "lts-nanoserver-#shorttag#",
         "lts-nanoserver-1909-#fulltag#"
     ],
+    "manifestLists": [
+        "nanoserver-lts"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/lts/nanoserver2004/meta.json b/release/lts/nanoserver2004/meta.json
index c563f48cf..395fcd0af 100644
--- a/release/lts/nanoserver2004/meta.json
+++ b/release/lts/nanoserver2004/meta.json
@@ -11,6 +11,9 @@
         "lts-nanoserver-#shorttag#",
         "lts-nanoserver-2004-#fulltag#"
     ],
+    "manifestLists": [
+        "nanoserver-lts"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
index e6eab0961..30d3be4eb 100644
--- a/release/lts/ubuntu18.04/meta.json
+++ b/release/lts/ubuntu18.04/meta.json
@@ -7,6 +7,9 @@
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
     ],
+    "manifestLists": [
+        "lts"
+    ],
     "shortTags": [
         {"Tag": "bionic"},
         {"Tag": "18.04"}
diff --git a/release/lts/windowsservercore1909/meta.json b/release/lts/windowsservercore1909/meta.json
index 7ac2a1f7d..0f0ede9ff 100644
--- a/release/lts/windowsservercore1909/meta.json
+++ b/release/lts/windowsservercore1909/meta.json
@@ -12,6 +12,9 @@
         "lts-windowsservercore-#shorttag#",
         "lts-windowsservercore-1909-#fulltag#"
     ],
+    "manifestLists": [
+        "lts"
+    ],
     "TestProperties": {
         "size": 1
     },
diff --git a/release/lts/windowsservercore2004/meta.json b/release/lts/windowsservercore2004/meta.json
index 060f07492..a13a2edaf 100644
--- a/release/lts/windowsservercore2004/meta.json
+++ b/release/lts/windowsservercore2004/meta.json
@@ -15,5 +15,8 @@
     "TestProperties": {
         "size": 1
     },
+    "manifestLists": [
+        "lts"
+    ],
     "UseAcr": true
 }

From 2dae715f29db7e51acc05312e710e21eff155aa7 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 9 Feb 2021 17:33:03 -0500
Subject: [PATCH 126/354] remove references to outdated dependencies from
 preview dockerfiles (#536)

---
 release/preview/arm32v7/docker/Dockerfile     | 4 ++--
 release/preview/debian10/docker/Dockerfile    | 1 -
 release/preview/debian11/docker/Dockerfile    | 1 -
 release/preview/ubuntu20.04/docker/Dockerfile | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile
index 57274d618..9a73e2ff1 100644
--- a/release/preview/arm32v7/docker/Dockerfile
+++ b/release/preview/arm32v7/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 FROM arm32v7/ubuntu:bionic AS installer-env
@@ -58,7 +58,7 @@ COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershe
 
 RUN \
   apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+  && apt-get install --no-install-recommends ca-certificates libssl1.0 libicu60 less --yes
 
     # Give all user execute permissions and remove write permissions for others
 RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile
index 5feb3d41f..6c72a15ca 100644
--- a/release/preview/debian10/docker/Dockerfile
+++ b/release/preview/debian10/docker/Dockerfile
@@ -60,7 +60,6 @@ RUN apt-get update \
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        liblttng-ust0 \
         libstdc++6 \
         zlib1g \
     # PowerShell remoting over SSH dependencies
diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile
index 7269b7f29..c2d611c8a 100644
--- a/release/preview/debian11/docker/Dockerfile
+++ b/release/preview/debian11/docker/Dockerfile
@@ -59,7 +59,6 @@ RUN apt-get update \
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        liblttng-ust0 \
         libstdc++6 \
         zlib1g \
     # PowerShell remoting over SSH dependencies
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile
index f0e388f8b..4027e2116 100644
--- a/release/preview/ubuntu20.04/docker/Dockerfile
+++ b/release/preview/ubuntu20.04/docker/Dockerfile
@@ -60,7 +60,6 @@ RUN apt-get update \
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        liblttng-ust0 \
         libstdc++6 \
         zlib1g \
     # PowerShell remoting over SSH dependencies

From 665d377eebe8980c3da57e8e1210b126bf8bc1e2 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 10 Feb 2021 19:08:50 -0800
Subject: [PATCH 127/354] fix version mismatch in build (#539)

---
 build.ps1                          |  2 +-
 createAllManifests.ps1             | 16 +++++++++++++++-
 tools/buildHelper/buildHelper.psm1 |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/build.ps1 b/build.ps1
index f484edd8e..db02ea9db 100755
--- a/build.ps1
+++ b/build.ps1
@@ -305,7 +305,7 @@ End {
                     {
                         $actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
                         $SubImagePath = Join-Path -Path $dockerFileName -ChildPath $allMeta.Meta.SubImage
-                        Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)" -Verbose
+                        Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)"
                         $subImageAllMeta = Get-DockerImageMetaDataWrapper `
                             -DockerFileName $SubImagePath `
                             -CI:$CI.IsPresent `
diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index d9c0b6e92..05d660d04 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -69,7 +69,21 @@ $buildScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'build.ps1'
 
 $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
 
-$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All"))
+$extraParams = ''
+
+if ($env:STABLERELEASETAG) {
+    $extraParams += " -StableVersion $($env:STABLERELEASETAG -replace '^v')"
+}
+
+if ($env:PREVIEWRELEASETAG) {
+    $extraParams += " -PreviewVersion $($env:PREVIEWRELEASETAG -replace '^v')"
+}
+
+if ($env:LTSRELEASETAG) {
+    $extraParams += " -LtsVersion $($env:LTSRELEASETAG -replace '^v')"
+}
+
+$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All $extraParams"))
 
 $manifestLists = $json | ConvertFrom-Json
 
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 1486cb93c..ff2dd10ee 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -485,7 +485,7 @@ function Get-DockerImageMetaDataWrapper
             }
         }
         else {
-            Write-Verbose "getting docker tag list" -Verbose
+            Write-Verbose "getting docker tag list"
             if($shortTags)
             {
                 $tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag

From 7e32919b7b88fd924766f9cbdefc2c5d6b99dffa Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 25 Feb 2021 16:47:40 -0500
Subject: [PATCH 128/354] Move Blackarch , Oraclelinux, and Archlinux images to
 unstable (#538)

---
 .../{community-stable => unstable}/archlinux/docker/Dockerfile  | 2 +-
 release/{community-stable => unstable}/archlinux/meta.json      | 0
 .../{community-stable => unstable}/blackarch/docker/Dockerfile  | 0
 release/{community-stable => unstable}/blackarch/meta.json      | 0
 .../oraclelinux/docker/Dockerfile                               | 0
 release/{community-stable => unstable}/oraclelinux/meta.json    | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename release/{community-stable => unstable}/archlinux/docker/Dockerfile (99%)
 rename release/{community-stable => unstable}/archlinux/meta.json (100%)
 rename release/{community-stable => unstable}/blackarch/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/blackarch/meta.json (100%)
 rename release/{community-stable => unstable}/oraclelinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/oraclelinux/meta.json (100%)

diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/unstable/archlinux/docker/Dockerfile
similarity index 99%
rename from release/community-stable/archlinux/docker/Dockerfile
rename to release/unstable/archlinux/docker/Dockerfile
index cf1f5ed37..4ddc8bb7c 100644
--- a/release/community-stable/archlinux/docker/Dockerfile
+++ b/release/unstable/archlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Arch Linux image with PowerShell
diff --git a/release/community-stable/archlinux/meta.json b/release/unstable/archlinux/meta.json
similarity index 100%
rename from release/community-stable/archlinux/meta.json
rename to release/unstable/archlinux/meta.json
diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/unstable/blackarch/docker/Dockerfile
similarity index 100%
rename from release/community-stable/blackarch/docker/Dockerfile
rename to release/unstable/blackarch/docker/Dockerfile
diff --git a/release/community-stable/blackarch/meta.json b/release/unstable/blackarch/meta.json
similarity index 100%
rename from release/community-stable/blackarch/meta.json
rename to release/unstable/blackarch/meta.json
diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/oraclelinux/docker/Dockerfile
rename to release/unstable/oraclelinux/docker/Dockerfile
diff --git a/release/community-stable/oraclelinux/meta.json b/release/unstable/oraclelinux/meta.json
similarity index 100%
rename from release/community-stable/oraclelinux/meta.json
rename to release/unstable/oraclelinux/meta.json

From 79ec70c8f5985937290f812ca0128686a9b470f2 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Fri, 2 Apr 2021 14:38:10 -0400
Subject: [PATCH 129/354] update buildHelper to check if isBroken tag present
 (#549)

---
 tools/buildHelper/buildHelper.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index ff2dd10ee..b95d897a9 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -449,7 +449,7 @@ function Get-DockerImageMetaDataWrapper
 
     # if the image is broken and we shouldn't include known issues,
     # do this
-    if(!$IncludeKnownIssues.IsPresent -and $meta.Broken -ne $null) {
+    if( !$IncludeKnownIssues.IsPresent -and $meta.IsBroken) {
         return
     }
 

From 890b315813c83ca55dfe9bab209abfed552a9c04 Mon Sep 17 00:00:00 2001
From: Vincent Boulineau <58430298+vboulineau@users.noreply.github.com>
Date: Mon, 12 Apr 2021 21:42:29 +0200
Subject: [PATCH 130/354] Add Windows 20H2 images (#523)

Signed-off-by: Vincent Boulineau <vincent.boulineau@datadoghq.com>
---
 .github/dependabot.yml                        |  2 +-
 .../dependabot/Dockerfile                     |  2 +-
 release/lts/nanoserver20H2/docker/Dockerfile  | 89 ++++++++++++++++++
 release/lts/nanoserver20H2/meta.json          | 20 +++++
 .../dependabot/Dockerfile                     |  2 +-
 .../windowsservercore20H2/docker/Dockerfile   | 67 ++++++++++++++
 release/lts/windowsservercore20H2/meta.json   | 20 +++++
 .../preview/nanoserver20H2/docker/Dockerfile  | 87 ++++++++++++++++++
 release/preview/nanoserver20H2/meta.json      | 21 +++++
 .../windowsservercore20H2/docker/Dockerfile   | 67 ++++++++++++++
 .../preview/windowsservercore20H2/meta.json   | 21 +++++
 .../servicing/nanoserver1809/getLatestTag.ps1 |  2 +-
 .../windowsservercore/getLatestTag.ps1        |  2 +-
 .../stable/nanoserver20H2/docker/Dockerfile   | 90 +++++++++++++++++++
 release/stable/nanoserver20H2/meta.json       | 21 +++++
 .../windowsservercore20H2/docker/Dockerfile   | 70 +++++++++++++++
 .../stable/windowsservercore20H2/meta.json    | 21 +++++
 17 files changed, 599 insertions(+), 5 deletions(-)
 rename release/lts/{nanoserver2004 => nanoserver20H2}/dependabot/Dockerfile (72%)
 create mode 100644 release/lts/nanoserver20H2/docker/Dockerfile
 create mode 100644 release/lts/nanoserver20H2/meta.json
 rename release/lts/{windowsservercore2004 => windowsservercore20H2}/dependabot/Dockerfile (72%)
 create mode 100644 release/lts/windowsservercore20H2/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore20H2/meta.json
 create mode 100644 release/preview/nanoserver20H2/docker/Dockerfile
 create mode 100644 release/preview/nanoserver20H2/meta.json
 create mode 100644 release/preview/windowsservercore20H2/docker/Dockerfile
 create mode 100644 release/preview/windowsservercore20H2/meta.json
 create mode 100644 release/stable/nanoserver20H2/docker/Dockerfile
 create mode 100644 release/stable/nanoserver20H2/meta.json
 create mode 100644 release/stable/windowsservercore20H2/docker/Dockerfile
 create mode 100644 release/stable/windowsservercore20H2/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a9343f5ea..bda9ebac0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -29,7 +29,7 @@ updates:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/nanoserver2004/dependabot"
+    directory: "/release/preview/nanoserver20H2/dependabot"
     schedule:
       interval: "weekly"
 
diff --git a/release/lts/nanoserver2004/dependabot/Dockerfile b/release/lts/nanoserver20H2/dependabot/Dockerfile
similarity index 72%
rename from release/lts/nanoserver2004/dependabot/Dockerfile
rename to release/lts/nanoserver20H2/dependabot/Dockerfile
index 863e481c7..2bb429d55 100644
--- a/release/lts/nanoserver2004/dependabot/Dockerfile
+++ b/release/lts/nanoserver20H2/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/nanoserver:2004
+FROM mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/release/lts/nanoserver20H2/docker/Dockerfile b/release/lts/nanoserver20H2/docker/Dockerfile
new file mode 100644
index 000000000..777790924
--- /dev/null
+++ b/release/lts/nanoserver20H2/docker/Dockerfile
@@ -0,0 +1,89 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:20H2
+
+ARG IMAGE_NAME=mcr.microsoft.com/powershell
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver20H2/meta.json b/release/lts/nanoserver20H2/meta.json
new file mode 100644
index 000000000..7018ce5ca
--- /dev/null
+++ b/release/lts/nanoserver20H2/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "tagTemplates": [
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-20H2-#fulltag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}
diff --git a/release/lts/windowsservercore2004/dependabot/Dockerfile b/release/lts/windowsservercore20H2/dependabot/Dockerfile
similarity index 72%
rename from release/lts/windowsservercore2004/dependabot/Dockerfile
rename to release/lts/windowsservercore20H2/dependabot/Dockerfile
index de415a7f7..b8c553b92 100644
--- a/release/lts/windowsservercore2004/dependabot/Dockerfile
+++ b/release/lts/windowsservercore20H2/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM mcr.microsoft.com/windows/servercore:2004
+FROM mcr.microsoft.com/windows/servercore:20H2
diff --git a/release/lts/windowsservercore20H2/docker/Dockerfile b/release/lts/windowsservercore20H2/docker/Dockerfile
new file mode 100644
index 000000000..15bf4270e
--- /dev/null
+++ b/release/lts/windowsservercore20H2/docker/Dockerfile
@@ -0,0 +1,67 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore20H2/meta.json b/release/lts/windowsservercore20H2/meta.json
new file mode 100644
index 000000000..ba6d77343
--- /dev/null
+++ b/release/lts/windowsservercore20H2/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-20H2-#fulltag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}
diff --git a/release/preview/nanoserver20H2/docker/Dockerfile b/release/preview/nanoserver20H2/docker/Dockerfile
new file mode 100644
index 000000000..791221f67
--- /dev/null
+++ b/release/preview/nanoserver20H2/docker/Dockerfile
@@ -0,0 +1,87 @@
+# escape=`
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0-rc.1
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver20H2/meta.json b/release/preview/nanoserver20H2/meta.json
new file mode 100644
index 000000000..6291b9a07
--- /dev/null
+++ b/release/preview/nanoserver20H2/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-20H2-#fulltag#",
+        "preview-nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}
diff --git a/release/preview/windowsservercore20H2/docker/Dockerfile b/release/preview/windowsservercore20H2/docker/Dockerfile
new file mode 100644
index 000000000..ffce740be
--- /dev/null
+++ b/release/preview/windowsservercore20H2/docker/Dockerfile
@@ -0,0 +1,67 @@
+# escape=`
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
+
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore20H2/meta.json b/release/preview/windowsservercore20H2/meta.json
new file mode 100644
index 000000000..8e081cd19
--- /dev/null
+++ b/release/preview/windowsservercore20H2/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-20H2-#fulltag#",
+        "preview-windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}
diff --git a/release/servicing/nanoserver1809/getLatestTag.ps1 b/release/servicing/nanoserver1809/getLatestTag.ps1
index b50d5ad3e..9eb49e8e1 100644
--- a/release/servicing/nanoserver1809/getLatestTag.ps1
+++ b/release/servicing/nanoserver1809/getLatestTag.ps1
@@ -17,5 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '(\d|H){4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
 
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
index 4b74754eb..554e8c399 100644
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ b/release/servicing/windowsservercore/getLatestTag.ps1
@@ -16,4 +16,4 @@ Import-Module $modulePath -Force
 # The versions of nanoserver we care about
 $shortTags = @('1809', '1903', '1909', '2004')
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '(\d|H){4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/nanoserver20H2/docker/Dockerfile b/release/stable/nanoserver20H2/docker/Dockerfile
new file mode 100644
index 000000000..db84868ed
--- /dev/null
+++ b/release/stable/nanoserver20H2/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver20H2/meta.json b/release/stable/nanoserver20H2/meta.json
new file mode 100644
index 000000000..2e712f41e
--- /dev/null
+++ b/release/stable/nanoserver20H2/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-20H2-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}
diff --git a/release/stable/windowsservercore20H2/docker/Dockerfile b/release/stable/windowsservercore20H2/docker/Dockerfile
new file mode 100644
index 000000000..247cd3fef
--- /dev/null
+++ b/release/stable/windowsservercore20H2/docker/Dockerfile
@@ -0,0 +1,70 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore20H2/meta.json b/release/stable/windowsservercore20H2/meta.json
new file mode 100644
index 000000000..5a1f795bc
--- /dev/null
+++ b/release/stable/windowsservercore20H2/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-20H2-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsBroken": true
+}

From c93fecde6e8faf16440e24003e3460c8b2ec5dff Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 19 Apr 2021 17:44:28 -0700
Subject: [PATCH 131/354] Update to use universal package names (#551)

---
 release/preview/centos7/meta.json     | 2 +-
 release/preview/centos8/meta.json     | 2 +-
 release/preview/debian9/meta.json     | 2 +-
 release/preview/fedora32/meta.json    | 2 +-
 release/preview/ubuntu16.04/meta.json | 2 +-
 release/preview/ubuntu18.04/meta.json | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
index 017f9c9f5..5394a93f3 100644
--- a/release/preview/centos7/meta.json
+++ b/release/preview/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#shorttag#-#fulltag#",
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
index ede7e72cb..524654986 100644
--- a/release/preview/centos8/meta.json
+++ b/release/preview/centos8/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 8",
     "tagTemplates": [
         "#psversion#-centos-#shorttag#-#fulltag#",
diff --git a/release/preview/debian9/meta.json b/release/preview/debian9/meta.json
index 929fcba64..c90e87112 100644
--- a/release/preview/debian9/meta.json
+++ b/release/preview/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb",
+    "PackageFormat": "powershell-preview_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/fedora32/meta.json b/release/preview/fedora32/meta.json
index d564c12a3..3e7e00fb4 100644
--- a/release/preview/fedora32/meta.json
+++ b/release/preview/fedora32/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 991f8ce8f..2f090477f 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-16.04-#fulltag#",
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index c7733429d..d2c37041f 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [

From 6ae6138afb839c7d19c0d909b2cdb72c7d159d55 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 24 May 2021 18:15:37 -0700
Subject: [PATCH 132/354] make short tag work for fedora 32 (#557)

---
 release/preview/fedora32/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/fedora32/meta.json b/release/preview/fedora32/meta.json
index 3e7e00fb4..eaa85ce04 100644
--- a/release/preview/fedora32/meta.json
+++ b/release/preview/fedora32/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-32-#fulltag#",
-        "preview-fedora-32"
+        "preview-fedora-#shorttag#"
     ],
     "shortTags": [
         {"Tag": "32"}

From 82e2d7b31f4364116319dc2745b4d636a3429d5d Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 3 Jun 2021 10:07:47 -0700
Subject: [PATCH 133/354] Add files for test deps for Fedora 32 (#559)

* Add files for test deps for Fedora 32

* Update release/stable/fedora32/test-deps/meta.json

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>

* Add required utils

* Update release/preview/fedora32/test-deps/docker/Dockerfile

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>

* Move kali linux to unstable

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/preview/fedora32/meta.json            |  1 +
 .../fedora32/test-deps/docker/Dockerfile      | 21 +++++++++++++++++++
 release/preview/fedora32/test-deps/meta.json  | 15 +++++++++++++
 release/stable/fedora32/meta.json             |  1 +
 .../fedora32/test-deps/docker/Dockerfile      | 21 +++++++++++++++++++
 release/stable/fedora32/test-deps/meta.json   | 15 +++++++++++++
 .../kalilinux/docker/Dockerfile               |  0
 .../kalilinux/meta.json                       |  0
 8 files changed, 74 insertions(+)
 create mode 100644 release/preview/fedora32/test-deps/docker/Dockerfile
 create mode 100644 release/preview/fedora32/test-deps/meta.json
 create mode 100644 release/stable/fedora32/test-deps/docker/Dockerfile
 create mode 100644 release/stable/fedora32/test-deps/meta.json
 rename release/{community-stable => unstable}/kalilinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/kalilinux/meta.json (100%)

diff --git a/release/preview/fedora32/meta.json b/release/preview/fedora32/meta.json
index eaa85ce04..b5a25311b 100644
--- a/release/preview/fedora32/meta.json
+++ b/release/preview/fedora32/meta.json
@@ -11,6 +11,7 @@
     "shortTags": [
         {"Tag": "32"}
     ],
+    "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
     }
diff --git a/release/preview/fedora32/test-deps/docker/Dockerfile b/release/preview/fedora32/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..16d8ef1cf
--- /dev/null
+++ b/release/preview/fedora32/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:preview-fedora-32
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN dnf install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps \
+        findutils \
+    && dnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/fedora32/test-deps/meta.json b/release/preview/fedora32/test-deps/meta.json
new file mode 100644
index 000000000..ed19ce5c2
--- /dev/null
+++ b/release/preview/fedora32/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "osVersion": "Fedora 32",
+    "tagTemplates": [
+        "preview-fedora-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/stable/fedora32/meta.json b/release/stable/fedora32/meta.json
index 237283614..5e93a9423 100644
--- a/release/stable/fedora32/meta.json
+++ b/release/stable/fedora32/meta.json
@@ -12,6 +12,7 @@
     "shortTags": [
         {"Tag": "32"}
     ],
+    "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
     }
diff --git a/release/stable/fedora32/test-deps/docker/Dockerfile b/release/stable/fedora32/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..d360aad2a
--- /dev/null
+++ b/release/stable/fedora32/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:fedora-32
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN dnf install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps \
+        findutils \
+    && dnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/fedora32/test-deps/meta.json b/release/stable/fedora32/test-deps/meta.json
new file mode 100644
index 000000000..6aa438d25
--- /dev/null
+++ b/release/stable/fedora32/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "osVersion": "Fedora 32",
+    "tagTemplates": [
+        "fedora-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/unstable/kalilinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/kalilinux/docker/Dockerfile
rename to release/unstable/kalilinux/docker/Dockerfile
diff --git a/release/community-stable/kalilinux/meta.json b/release/unstable/kalilinux/meta.json
similarity index 100%
rename from release/community-stable/kalilinux/meta.json
rename to release/unstable/kalilinux/meta.json

From 6d37eaa9510385dc4a54710668b6f52d24c0c3a1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Jul 2021 15:12:25 -0700
Subject: [PATCH 134/354] Update rebase.yml

---
 .github/workflows/rebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index c63426a01..ff88a2ed3 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -13,6 +13,6 @@ jobs:
       with:
         fetch-depth: 0
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.3.1
+      uses: cirrus-actions/rebase@1.4
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 8a8a601f5908ee3a2929bac481ac6d49c26197ea Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 30 Jul 2021 12:35:07 -0700
Subject: [PATCH 135/354] Make internal version of LTSC 2022 work (#561)

---
 .vsts-ci/communityReleasePhase.yml            |  2 +-
 .vsts-ci/communityReleaseStage.yml            |  4 +-
 .vsts-ci/manifestSteps.yml                    |  2 +-
 .vsts-ci/phase.yml                            |  2 +-
 .vsts-ci/releasePhase.yml                     |  2 +-
 .vsts-ci/releasePipeline.yml                  |  8 ++
 .vsts-ci/releaseStage.yml                     |  7 +-
 .vsts-ci/releasebuild.yml                     | 12 +++
 .vsts-ci/stage.yml                            |  4 +-
 .../templatesReleasePipeline/releaseJob.yml   | 13 ++-
 .../releaseManifestList.yml                   | 12 ++-
 .../templatesReleasePipeline/releaseStage.yml | 10 +-
 .../testAndRelease.yml                        |  3 +
 .vsts-ci/templatesReleasePipeline/testJob.yml |  2 +-
 .../templatesReleasePipeline/testStage.yml    |  4 +-
 build.ps1                                     |  6 +-
 .../stable/nanoserver2022/docker/Dockerfile   | 92 +++++++++++++++++++
 release/stable/nanoserver2022/meta.json       | 24 +++++
 .../windowsservercore2022/docker/Dockerfile   | 72 +++++++++++++++
 .../stable/windowsservercore2022/meta.json    | 24 +++++
 .../parrotsec/docker/Dockerfile               |  0
 .../parrotsec/meta.json                       |  0
 tests/containerTestCommon.psm1                |  2 +
 tools/buildHelper/buildHelper.psm1            |  9 +-
 vsts-ci.yml                                   |  2 +-
 25 files changed, 289 insertions(+), 29 deletions(-)
 create mode 100644 release/stable/nanoserver2022/docker/Dockerfile
 create mode 100644 release/stable/nanoserver2022/meta.json
 create mode 100644 release/stable/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/stable/windowsservercore2022/meta.json
 rename release/{community-stable => unstable}/parrotsec/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/parrotsec/meta.json (100%)

diff --git a/.vsts-ci/communityReleasePhase.yml b/.vsts-ci/communityReleasePhase.yml
index cf5199ecb..121348221 100644
--- a/.vsts-ci/communityReleasePhase.yml
+++ b/.vsts-ci/communityReleasePhase.yml
@@ -1,5 +1,5 @@
 parameters:
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   jobName: 'none'
   releaseTag: ''
   matrix: ''
diff --git a/.vsts-ci/communityReleaseStage.yml b/.vsts-ci/communityReleaseStage.yml
index e7e976194..c48238d8c 100644
--- a/.vsts-ci/communityReleaseStage.yml
+++ b/.vsts-ci/communityReleaseStage.yml
@@ -1,7 +1,7 @@
 parameters:
   channel: 'preview'
   jobName: ''
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   acr: 'All'
   useacr: 'false'
   osFilter: 'All'
@@ -15,7 +15,7 @@ stages:
     jobs:
     - job: GenerateYaml_${{ variables.jobName }}
       pool:
-        vmImage: ubuntu-16.04
+        vmImage: ubuntu-latest
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
diff --git a/.vsts-ci/manifestSteps.yml b/.vsts-ci/manifestSteps.yml
index 177bea898..4d1cc63f3 100644
--- a/.vsts-ci/manifestSteps.yml
+++ b/.vsts-ci/manifestSteps.yml
@@ -21,7 +21,7 @@ steps:
   displayName: 'docker login'
 
 - pwsh: |
-        ./createAllManifests.ps1 -Registry '$(dockerHost)/$(dockerNamespace)' -Channel $(Channel)
+        ./createAllManifests.ps1 -Registry '$(dockerHost)/public/$(dockerNamespace)' -Channel $(Channel)
   displayName: 'Create $(Channel) Manifest Lists'
 
 - powershell: 'docker logout $(dockerHost)'
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index b289fc423..2dd9c8cca 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -1,6 +1,6 @@
 parameters:
   name: ''
-  vmImage: 'ubuntu-18.04'
+  vmImage: 'ubuntu-latest'
   continueonerror: false
   ciParameter: '-CI'
   useacr: 'false'
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 280e5023c..a1893d7f5 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,5 +1,5 @@
 parameters:
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
index 394fcd39a..dab8cb66b 100644
--- a/.vsts-ci/releasePipeline.yml
+++ b/.vsts-ci/releasePipeline.yml
@@ -4,6 +4,11 @@ trigger: none
 # when the branch is same as pipline source, the latest build from the source is used.
 # all environment used are for manual tasks and approvals.
 
+parameters:
+  - name: WhatIf
+    default: "No"
+    displayName: "Only show what would be done"
+
 resources:
   pipelines:
   - pipeline: releasePipeline
@@ -19,14 +24,17 @@ stages:
 - template: ./templatesReleasePipeline/testAndRelease.yml
   parameters:
     channel: "preview"
+    WhatIf: ${{ parameters.WhatIf }}
 
 - template: ./templatesReleasePipeline/testAndRelease.yml
   parameters:
     channel: "stable"
+    WhatIf: ${{ parameters.WhatIf }}
 
 - template: ./templatesReleasePipeline/testAndRelease.yml
   parameters:
     channel: "lts"
+    WhatIf: ${{ parameters.WhatIf }}
 
 - stage: Approve_Release
   condition: succeeded()
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 3f149b59a..69525db09 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -1,6 +1,6 @@
 parameters:
   channel: 'preview'
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   acr: 'All'
   useacr: 'false'
   osFilter: 'All'
@@ -12,7 +12,7 @@ stages:
     jobs:
     - job: GenerateYaml_${{ parameters.channel }}
       pool:
-        vmImage: ubuntu-16.04
+        vmImage: ubuntu-latest
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
@@ -38,6 +38,3 @@ stages:
         jobName: Build_Win
         vmImage: windows-2019
         ACR: yes
-        # failure rate is High in ACR for Windows and we have few images.
-        # No reason to stress the system.
-        maxParallel: 3
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index ba90bbe90..139db477b 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -1,5 +1,13 @@
 name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
+parameters:
+  - name: 'previewReleaseTag'
+    default: v7.2.0-preview.8
+  - name: 'ltsReleaseTag'
+    default: v7.0.6
+  - name: 'stableReleaseTag'
+    default: v7.1.3
+
 resources:
 - repo: self
   clean: true
@@ -7,6 +15,10 @@ resources:
 variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOCKER_RELEASE: true
+  previewReleaseTag: ${{ parameters.previewReleaseTag }}
+  ltsReleaseTag: ${{ parameters.ltsReleaseTag }}
+  stableReleaseTag: ${{ parameters.stableReleaseTag }}
+  runCodesignValidationInjection: false
 
 stages:
   - stage: GenerateFullTag
diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index 5ceec85d3..38c341425 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -1,7 +1,7 @@
 parameters:
   channel: 'preview'
   jobName: ''
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   winCiParameter: '-CI -TagFilter 1809'
   acr: 'NoAcr'
   useacr: 'false'
@@ -16,7 +16,7 @@ stages:
     jobs:
     - job: GenerateYaml_${{ variables.jobName }}
       pool:
-        vmImage: ubuntu-16.04
+        vmImage: ubuntu-latest
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
index 985eadc07..24cf33076 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -1,10 +1,11 @@
 parameters:
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
   maxParallel: 5
   dependsOn: []
+  WhatIf: 'no'
 
 jobs:
   - job: ${{ parameters.jobName }}
@@ -23,6 +24,8 @@ jobs:
         value: ${{ parameters.ACR }}
       - name: "releaseTag"
         value: ${{ parameters.releaseTag }}
+      - name: "WhatIf"
+        value: ${{ parameters.WhatIf }}
 
     pool:
       vmImage: ${{ parameters.vmImage }}
@@ -78,9 +81,13 @@ jobs:
             foreach($repo in $repos) {
               foreach($tag in $tags.$repo.tags) {
                 $name = $repo + ":" + $tag
-                $stagingRepo = $repo -replace 'public/', '$(dockerNamespace)/'
+                $stagingRepo = ($repo -replace 'public/', 'public/$(dockerNamespace)/') -replace 'internal/', 'internal/$(dockerNamespace)/'
                 Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
-                az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+                if($env:WHATIF -eq 'No') {
+                  az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+                } else {
+                  Write-verbose "skipping import due to whatif" -verbose
+                }
               }
             }
       displayName: 'release - $(channel) - $(imagename)'
diff --git a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
index 99709e859..a846a2484 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
@@ -1,11 +1,12 @@
 parameters:
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
   maxParallel: 5
   dependsOn: []
   channel: STABLE
+  WhatIf: 'no'
 
 jobs:
   - job: ${{ parameters.jobName }}
@@ -21,6 +22,8 @@ jobs:
         value: ${{ parameters.ACR }}
       - name: "releaseTag"
         value: ${{ parameters.releaseTag }}
+      - name: "WhatIf"
+        value: ${{ parameters.WhatIf }}
 
     pool:
       vmImage: ${{ parameters.vmImage }}
@@ -78,7 +81,12 @@ jobs:
                 $name = $repo + ":" + $tag
                 $stagingRepo = $repo -replace 'public/', '$(dockerNamespace)/'
                 Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
-                az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+                if($env:WHATIF -eq 'No') {
+                  az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
+                } else {
+                  Write-verbose "skipping import due to whatif" -verbose
+                }
+
               }
             }
       displayName: 'release - $(channel) - $(imagename)'
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index cbbdf417d..357a5828d 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -2,13 +2,16 @@ parameters:
     - name: "channel"
       default: 'preview'
     - name: "vmImage"
-      default: 'ubuntu-16.04'
+      default: 'ubuntu-latest'
     - name: "acr"
       default: 'All'
     - name: "useacr"
       default: 'false'
     - name: "osFilter"
       default: 'All'
+    - name: "WhatIf"
+      default: 'No'
+
 
 stages:
     - stage: Release_${{ parameters.channel }}
@@ -18,7 +21,7 @@ stages:
       jobs:
       - job: GenerateYaml_${{ parameters.channel }}
         pool:
-            vmImage: ubuntu-16.04
+            vmImage: ubuntu-latest
         displayName: Generate Matrix YAML ${{ parameters.channel }}
         steps:
         - pwsh: |
@@ -35,6 +38,7 @@ stages:
         parameters:
           jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+          WhatIf: ${{ parameters.WhatIf }}
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
@@ -42,6 +46,7 @@ stages:
         parameters:
           jobName: ${{ parameters.channel }}_linux
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+          WhatIf: ${{ parameters.WhatIf }}
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
@@ -51,3 +56,4 @@ stages:
         parameters:
           jobName: ${{ parameters.channel }}_manifest_list
           channel: ${{ parameters.channel }}
+          WhatIf: ${{ parameters.WhatIf }}
diff --git a/.vsts-ci/templatesReleasePipeline/testAndRelease.yml b/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
index 4c404446f..7000bc0c3 100644
--- a/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
+++ b/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
@@ -1,6 +1,8 @@
 parameters:
     - name: "channel"
       default: 'preview'
+    - name: "WhatIf"
+      default: 'No'
 
 stages:
 - template: ./testStage.yml
@@ -10,3 +12,4 @@ stages:
 - template: ./releaseStage.yml
   parameters:
     channel: ${{ parameters.channel }}
+    WhatIf: ${{ parameters.WhatIf }}
diff --git a/.vsts-ci/templatesReleasePipeline/testJob.yml b/.vsts-ci/templatesReleasePipeline/testJob.yml
index f4c09b103..3ff1d522e 100644
--- a/.vsts-ci/templatesReleasePipeline/testJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/testJob.yml
@@ -1,5 +1,5 @@
 parameters:
-  vmImage: 'ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
   jobName: 'none'
   releaseTag: ''
   ACR: 'no'
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index 74266923a..eab8ffa01 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -2,7 +2,7 @@ parameters:
     - name: "channel"
       default: 'preview'
     - name: "vmImage"
-      default: 'ubuntu-16.04'
+      default: 'ubuntu-latest'
     - name: "acr"
       default: 'All'
     - name: "useacr"
@@ -20,7 +20,7 @@ stages:
       jobs:
       - job: GenerateYaml_${{ parameters.channel }}
         pool:
-          vmImage: ubuntu-16.04
+          vmImage: ubuntu-latest
         displayName: Generate Matrix YAML ${{ parameters.channel }}
         steps:
         - pwsh: |
diff --git a/build.ps1 b/build.ps1
index db02ea9db..ef1dd4d9d 100755
--- a/build.ps1
+++ b/build.ps1
@@ -282,7 +282,7 @@ End {
                 -Version $windowsVersion `
                 -ImageName $ImageName `
                 -LinuxVersion $linuxVersion `
-                -BaseRepositry $Repository `
+                -BaseRepository $Repository `
                 -Strict:$CheckForDuplicateTags.IsPresent `
                 -Channel $actualChannel
 
@@ -317,7 +317,7 @@ End {
                             -LinuxVersion $linuxVersion `
                             -TagData $allMeta.TagData `
                             -BaseImage $actualTagData.ActualTags[0] `
-                            -BaseRepositry $Repository `
+                            -BaseRepository $Repository `
                             -Strict:$CheckForDuplicateTags.IsPresent `
                             -FromTag $tagGroup.Name `
                             -Channel $actualChannel
@@ -390,7 +390,7 @@ End {
                     continue
                 }
 
-                $tagGroup = "public/$($allMeta.FullRepository)"
+                $tagGroup = $($allMeta.FullRepository)
                 $os = 'windows'
                 if ($allMeta.meta.IsLinux) {
                     $os = 'linux'
diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile
new file mode 100644
index 000000000..0ad72445d
--- /dev/null
+++ b/release/stable/nanoserver2022/docker/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG dockerHost=mcr.microsoft.com
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=windows/nanoserver
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${dockerHost}/${NanoServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver2022/meta.json b/release/stable/nanoserver2022/meta.json
new file mode 100644
index 000000000..5fb0dab18
--- /dev/null
+++ b/release/stable/nanoserver2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-#shorttag#-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}
diff --git a/release/stable/windowsservercore2022/docker/Dockerfile b/release/stable/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..084354505
--- /dev/null
+++ b/release/stable/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore2022/meta.json b/release/stable/windowsservercore2022/meta.json
new file mode 100644
index 000000000..d3335f497
--- /dev/null
+++ b/release/stable/windowsservercore2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}
diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/unstable/parrotsec/docker/Dockerfile
similarity index 100%
rename from release/community-stable/parrotsec/docker/Dockerfile
rename to release/unstable/parrotsec/docker/Dockerfile
diff --git a/release/community-stable/parrotsec/meta.json b/release/unstable/parrotsec/meta.json
similarity index 100%
rename from release/community-stable/parrotsec/meta.json
rename to release/unstable/parrotsec/meta.json
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index d310ee4b2..cec3340c2 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -509,6 +509,8 @@ function Invoke-DockerBuild
             $env:ACR_NAME
             '--platform'
             $OSType
+            "--build-arg"
+            "dockerHost=$env:DOCKERHOST"
         )
     }
     else {
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index b95d897a9..5f7dd12c0 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -192,6 +192,9 @@ class DockerImageMetaData {
 
     [string]
     $ManifestLists = @()
+
+    [bool]
+    $IsPrivate = $false
 }
 
 class ShortTagMetaData {
@@ -422,7 +425,7 @@ function Get-DockerImageMetaDataWrapper
         $BaseImage,
 
         [string]
-        $BaseRepositry,
+        $BaseRepository,
 
         [switch]
         $Strict,
@@ -520,7 +523,9 @@ function Get-DockerImageMetaDataWrapper
     }
     else
     {
-        $fullRepository = $BaseRepositry
+        $scope = if ($meta.IsPrivate) { "internal" } else { "public" }
+        $fullRepository = $scope + '/' + $BaseRepository
+
         if ($meta.SubRepository)
         {
             $fullRepository += '/{0}' -f $meta.SubRepository
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 36e4c705a..c57e3d29b 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -28,7 +28,7 @@ stages:
     jobs:
     - job: CheckForDuplicateTags
       pool:
-        vmImage: ubuntu-18.04
+        vmImage: ubuntu-latest
       displayName: Check For Duplicate Tags
       steps:
       - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"

From c21467971c77f842973cd629e0134085fe86d343 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 4 Aug 2021 11:12:16 -0700
Subject: [PATCH 136/354] Update manifest list and tag YAML for changes that
 allow internal images (#562)

* fix manifest release

* convert parameters to new format

* convert phase params to new format

* convert parameters to new format

* fix job

* skip generating tags yaml for private images
---
 .vsts-ci/releasePhase.yml                     | 19 ++++---
 .vsts-ci/releaseStage.yml                     | 15 ++++--
 .../templatesReleasePipeline/releaseJob.yml   | 26 +++++----
 .../releaseManifestList.yml                   | 27 ++++++----
 build.ps1                                     | 53 +++++++++++--------
 5 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index a1893d7f5..f0892c04d 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,10 +1,17 @@
 parameters:
-  vmImage: 'ubuntu-latest'
-  jobName: 'none'
-  releaseTag: ''
-  ACR: 'no'
-  maxParallel: 5
-  dependsOn: []
+  - name: vmImage
+    default: 'ubuntu-latest'
+  - name: jobName
+    default: 'none'
+  - name: releaseTag
+    default: ''
+  - name: ACR
+    default: 'No'
+  - name: maxParallel
+    default: 5
+  - name: dependsOn
+    default: []
+    type: object
 
 jobs:
 - job: ${{ parameters.jobName }}
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 69525db09..2887062d8 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -1,9 +1,14 @@
 parameters:
-  channel: 'preview'
-  vmImage: 'ubuntu-latest'
-  acr: 'All'
-  useacr: 'false'
-  osFilter: 'All'
+  - name: channel
+    default: 'preview'
+  - name: vmImage
+    default: 'ubuntu-latest'
+  - name: acr
+    default: 'All'
+  - name: useacr
+    default: 'false'
+  - name: osFilter
+    default: 'All'
 
 stages:
   - stage: GenerateYaml_${{ parameters.channel }}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
index 24cf33076..470489c06 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -1,11 +1,21 @@
 parameters:
-  vmImage: 'ubuntu-latest'
-  jobName: 'none'
-  releaseTag: ''
-  ACR: 'no'
-  maxParallel: 5
-  dependsOn: []
-  WhatIf: 'no'
+  - name: vmImage
+    default: 'ubuntu-latest'
+  - name: jobName
+    default: 'none'
+  - name: releaseTag
+    default: ''
+  - name: ACR
+    default: 'No'
+  - name: maxParallel
+    default: 5
+  - name: dependsOn
+    default: []
+    type: object
+  - name: WhatIf
+    default: 'no'
+  - name: matrix
+    default: ''
 
 jobs:
   - job: ${{ parameters.jobName }}
@@ -18,8 +28,6 @@ jobs:
       - group: 'Staging_ACR'
       - name: 'dockerImage'
         value: 'powershell'
-      - name: "Channel"
-        value: ${{ parameters.channel }}
       - name: "ACR"
         value: ${{ parameters.ACR }}
       - name: "releaseTag"
diff --git a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
index a846a2484..5344e7ecd 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
@@ -1,12 +1,21 @@
 parameters:
-  vmImage: 'ubuntu-latest'
-  jobName: 'none'
-  releaseTag: ''
-  ACR: 'no'
-  maxParallel: 5
-  dependsOn: []
-  channel: STABLE
-  WhatIf: 'no'
+  - name: vmImage
+    default: 'windows-latest'
+  - name: jobName
+    default: 'none'
+  - name: releaseTag
+    default: ''
+  - name: ACR
+    default: 'no'
+  - name: maxParallel
+    default: 5
+  - name: dependsOn
+    default: []
+    type: object
+  - name: channel
+    default: STABLE
+  - name: WhatIf
+    default: 'no'
 
 jobs:
   - job: ${{ parameters.jobName }}
@@ -79,7 +88,7 @@ jobs:
             foreach($repo in $repos) {
               foreach($tag in ($manifestLists | where-object {$_.repo -eq $repo}).ManifestList) {
                 $name = $repo + ":" + $tag
-                $stagingRepo = $repo -replace 'public/', '$(dockerNamespace)/'
+                $stagingRepo = ($repo -replace 'public/', 'public/$(dockerNamespace)/') -replace 'internal/', 'internal/$(dockerNamespace)/'
                 Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
                 if($env:WHATIF -eq 'No') {
                   az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
diff --git a/build.ps1 b/build.ps1
index ef1dd4d9d..e694225dc 100755
--- a/build.ps1
+++ b/build.ps1
@@ -421,26 +421,31 @@ End {
                         $osVersion = ''
                     }
 
-                    if(!$tagGroups.ContainsKey($tagGroup))
-                    {
-                        $tags = @()
-                        $tagGroups[$tagGroup] = $tags
-                    }
+                    # skip if we are generate TagsYaml and the image is private.
+                    if (!$GenerateTagsYaml.IsPresent -or !$allMeta.Meta.IsPrivate) {
+                        if (!$tagGroups.ContainsKey($tagGroup)) {
+                            $tags = @()
+                            $tagGroups[$tagGroup] = $tags
+                        }
 
-                    $tag = [PSCustomObject]@{
-                        Architecture    = $architecture
-                        OsVersion       = $osVersion
-                        Os              = $os
-                        Tags            = $actualTagData.TagList
-                        Dockerfile      = $dockerfile
-                        Channel         = $actualChannel
-                        Name            = $dockerFileName
-                        UseAcr          = $UseAcr
-                        ContinueOnError = $continueOnError
-                        ManifestLists   = $manifestLists
-                    }
+                        $tag = [PSCustomObject]@{
+                            Architecture    = $architecture
+                            OsVersion       = $osVersion
+                            Os              = $os
+                            Tags            = $actualTagData.TagList
+                            Dockerfile      = $dockerfile
+                            Channel         = $actualChannel
+                            Name            = $dockerFileName
+                            UseAcr          = $UseAcr
+                            ContinueOnError = $continueOnError
+                            ManifestLists   = $manifestLists
+                        }
 
-                    $tagGroups[$tagGroup] += $tag
+                        $tagGroups[$tagGroup] += $tag
+                    }
+                    else {
+                        Write-Verbose -Message "skipping generating yaml for $dockerFileName" -Verbose
+                    }
                 }
                 else {
                     Write-Verbose "Skipping $($actualTagData.tagList[0]) due to no OS Version in meta.json" -Verbose
@@ -519,11 +524,13 @@ End {
                 Write-Output "    tagGroups:"
                 foreach($tag in $tagGroups.$repo | Sort-Object -Property dockerfile)
                 {
-                    Write-Output "    - tags: [$($tag.Tags -join ', ')]"
-                    Write-Output "      osVersion: $($tag.osVersion)"
-                    Write-Output "      architecture: $($tag.architecture)"
-                    Write-Output "      os: $($tag.os)"
-                    Write-Output "      dockerfile: $($tag.dockerfile)"
+                    if (!$tag.IsPrivate) {
+                        Write-Output "    - tags: [$($tag.Tags -join ', ')]"
+                        Write-Output "      osVersion: $($tag.osVersion)"
+                        Write-Output "      architecture: $($tag.architecture)"
+                        Write-Output "      os: $($tag.os)"
+                        Write-Output "      dockerfile: $($tag.dockerfile)"
+                    }
                 }
             }
         }

From 98e61967315047a42cbd4a4d49699e1899c76b67 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 11 Aug 2021 15:11:28 -0400
Subject: [PATCH 137/354] Preview 2022 images (#564)

---
 .../preview/nanoserver2022/docker/Dockerfile  | 92 +++++++++++++++++++
 release/preview/nanoserver2022/meta.json      | 24 +++++
 .../windowsservercore2022/docker/Dockerfile   | 72 +++++++++++++++
 .../preview/windowsservercore2022/meta.json   | 24 +++++
 4 files changed, 212 insertions(+)
 create mode 100644 release/preview/nanoserver2022/docker/Dockerfile
 create mode 100644 release/preview/nanoserver2022/meta.json
 create mode 100644 release/preview/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/preview/windowsservercore2022/meta.json

diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile
new file mode 100644
index 000000000..0ad72445d
--- /dev/null
+++ b/release/preview/nanoserver2022/docker/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG dockerHost=mcr.microsoft.com
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=windows/nanoserver
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${dockerHost}/${NanoServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
new file mode 100644
index 000000000..4bf1d2e6e
--- /dev/null
+++ b/release/preview/nanoserver2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-#shorttag#-#fulltag#",
+        "preview-nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}
diff --git a/release/preview/windowsservercore2022/docker/Dockerfile b/release/preview/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..084354505
--- /dev/null
+++ b/release/preview/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
new file mode 100644
index 000000000..a8ccc0c99
--- /dev/null
+++ b/release/preview/windowsservercore2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
+        "preview-windowsservercore-#shorttag#"
+    ],
+    "manifestLists": [
+        "preview"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}

From 52942c2dac13d9a0ff9ab65df82dda023f4ceace Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 11 Aug 2021 15:12:40 -0400
Subject: [PATCH 138/354] Add LTS nanoserver2022 and windowsservercore2022
 images (#565)

---
 release/lts/nanoserver2022/docker/Dockerfile  | 92 +++++++++++++++++++
 release/lts/nanoserver2022/meta.json          | 24 +++++
 .../windowsservercore2022/docker/Dockerfile   | 72 +++++++++++++++
 release/lts/windowsservercore2022/meta.json   | 24 +++++
 4 files changed, 212 insertions(+)
 create mode 100644 release/lts/nanoserver2022/docker/Dockerfile
 create mode 100644 release/lts/nanoserver2022/meta.json
 create mode 100644 release/lts/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/lts/windowsservercore2022/meta.json

diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile
new file mode 100644
index 000000000..0ad72445d
--- /dev/null
+++ b/release/lts/nanoserver2022/docker/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG dockerHost=mcr.microsoft.com
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=windows/nanoserver
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${dockerHost}/${NanoServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json
new file mode 100644
index 000000000..b89decb8a
--- /dev/null
+++ b/release/lts/nanoserver2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "tagTemplates": [
+        "lts-#psversion#-nanoserver-#shorttag#",
+        "lts-nanoserver-#shorttag#",
+        "lts-nanoserver-#shorttag#-#fulltag#"
+    ],
+    "manifestLists": [
+        "nanoserver-lts"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}
diff --git a/release/lts/windowsservercore2022/docker/Dockerfile b/release/lts/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..084354505
--- /dev/null
+++ b/release/lts/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json
new file mode 100644
index 000000000..2bb12640a
--- /dev/null
+++ b/release/lts/windowsservercore2022/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-#psversion#-windowsservercore-#shorttag#",
+        "lts-windowsservercore-#shorttag#",
+        "lts-windowsservercore-#shorttag#-#fulltag#"
+    ],
+    "manifestLists": [
+        "lts"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "IsPrivate": true
+}

From 49e95577075f50987f268428b3e43bb31a43fb37 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 12 Aug 2021 09:46:43 -0700
Subject: [PATCH 139/354] Add matrix parameter (#566)

---
 .vsts-ci/releasePhase.yml |  2 +-
 build.ps1                 | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index f0892c04d..ccd4138d4 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -12,6 +12,7 @@ parameters:
   - name: dependsOn
     default: []
     type: object
+  - name: matrix
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -22,7 +23,6 @@ jobs:
       maxParallel: ${{ parameters.maxParallel }}
   variables:
     dockerImage: 'powershell'
-    Channel: ${{ parameters.channel }}
     ACR: ${{ parameters.ACR }}
     releaseTag: ${{ parameters.releaseTag }}
 
diff --git a/build.ps1 b/build.ps1
index e694225dc..bf5048f1a 100755
--- a/build.ps1
+++ b/build.ps1
@@ -524,13 +524,11 @@ End {
                 Write-Output "    tagGroups:"
                 foreach($tag in $tagGroups.$repo | Sort-Object -Property dockerfile)
                 {
-                    if (!$tag.IsPrivate) {
-                        Write-Output "    - tags: [$($tag.Tags -join ', ')]"
-                        Write-Output "      osVersion: $($tag.osVersion)"
-                        Write-Output "      architecture: $($tag.architecture)"
-                        Write-Output "      os: $($tag.os)"
-                        Write-Output "      dockerfile: $($tag.dockerfile)"
-                    }
+                    Write-Output "    - tags: [$($tag.Tags -join ', ')]"
+                    Write-Output "      osVersion: $($tag.osVersion)"
+                    Write-Output "      architecture: $($tag.architecture)"
+                    Write-Output "      os: $($tag.os)"
+                    Write-Output "      dockerfile: $($tag.dockerfile)"
                 }
             }
         }

From cc6c6937b6d9dce07f76cb87b9473b11b1afc08f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 12 Aug 2021 12:45:19 -0700
Subject: [PATCH 140/354] Create mirrorInternalImages.yml (#567)

---
 .vsts-ci/mirrorInternalImages.yml | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .vsts-ci/mirrorInternalImages.yml

diff --git a/.vsts-ci/mirrorInternalImages.yml b/.vsts-ci/mirrorInternalImages.yml
new file mode 100644
index 000000000..449cbca96
--- /dev/null
+++ b/.vsts-ci/mirrorInternalImages.yml
@@ -0,0 +1,58 @@
+variables:
+  - group: mcrint
+
+parameters:
+  - name: publicSource
+    default: no
+    displayName: no if the source requires login, yes if the source does not.
+  - name: sourceHostName
+    displayName: Source HostName
+  - name: sourceServerCoreImageName
+    default: windows/servercore:ltsc2022
+    displayName: Source Window servercore Image name without server name
+  - name: sourceNanoImageName
+    default: windows/nanoserver:ltsc2022
+    displayName: Source Window servercore Image name without server name
+
+jobs:
+- job: Mirror
+  pool:
+    vmImage: vs2017-win2016
+
+  strategy:
+    matrix:
+      servercore:
+        sourceImage: ${{ parameters.sourceServerCoreImageName }}
+        targetImage: windows/servercore:ltsc2022
+      nanoserver:
+        sourceImage: ${{ parameters.sourceNanoImageName }}
+        targetImage: windows/nanoserver:ltsc2022
+
+  displayName: Mirror Image
+  steps:
+  - checkout: self
+  - task: AzureCLI@2
+    displayName: Mirror $(targetImage) - with login
+    condition: and(succeeded(), eq('${{ parameters.publicSource }}', 'no'))
+    inputs:
+      connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9
+      scriptType: pscore
+      scriptLocation: inlineScript
+      inlineScript: >-
+        az acr import --name $(targetusername) `
+          --source $(mcrinthostname)/$(sourceImage) `
+          --image $(targetImage) `
+          --username $(mcrintusername) `
+          --password $(mcrintsecret) --force
+  - task: AzureCLI@2
+    displayName: Mirror $(targetImage) - without login
+    condition: and(succeeded(), ne('${{ parameters.publicSource }}', 'no'))
+    inputs:
+      connectedServiceNameARM: c58d97a0-15dd-4781-b8b9-c8a0c2fdcdd9
+      scriptType: pscore
+      scriptLocation: inlineScript
+      inlineScript: >-
+        az acr import --name $(targetusername) `
+          --source $(mcrinthostname)/$(sourceImage) `
+          --image $(targetImage) --force
+

From b37afbd72eccc18c71569e3a4da77e7bea4811bb Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 12 Aug 2021 17:36:51 -0400
Subject: [PATCH 141/354] remove manifest list from 2022 preview images (#568)

---
 release/preview/nanoserver2022/meta.json        | 3 ---
 release/preview/windowsservercore2022/meta.json | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
index 4bf1d2e6e..e4553ab95 100644
--- a/release/preview/nanoserver2022/meta.json
+++ b/release/preview/nanoserver2022/meta.json
@@ -12,9 +12,6 @@
         "#psversion#-nanoserver-#shorttag#-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
-    "manifestLists": [
-        "nanoserver"
-    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
index a8ccc0c99..fb0577433 100644
--- a/release/preview/windowsservercore2022/meta.json
+++ b/release/preview/windowsservercore2022/meta.json
@@ -13,9 +13,6 @@
         "#psversion#-windowsservercore-#shorttag#-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
-    "manifestLists": [
-        "preview"
-    ],
     "TestProperties": {
         "size": 1
     },

From b8e960baa7c428324c3fe05f5a761079b49c5358 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 18 Aug 2021 21:13:42 -0400
Subject: [PATCH 142/354] Public 2022 images (#569)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/lts/nanoserver2022/docker/Dockerfile            | 2 +-
 release/lts/nanoserver2022/meta.json                    | 3 +--
 release/lts/windowsservercore2022/docker/Dockerfile     | 4 ++--
 release/lts/windowsservercore2022/meta.json             | 3 +--
 release/preview/nanoserver2022/docker/Dockerfile        | 2 +-
 release/preview/nanoserver2022/meta.json                | 3 +--
 release/preview/windowsservercore2022/docker/Dockerfile | 4 ++--
 release/preview/windowsservercore2022/meta.json         | 3 +--
 release/stable/nanoserver2022/docker/Dockerfile         | 2 +-
 release/stable/nanoserver2022/meta.json                 | 3 +--
 release/stable/windowsservercore2022/docker/Dockerfile  | 4 ++--
 release/stable/windowsservercore2022/meta.json          | 3 +--
 12 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile
index 0ad72445d..c91928b83 100644
--- a/release/lts/nanoserver2022/docker/Dockerfile
+++ b/release/lts/nanoserver2022/docker/Dockerfile
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${dockerHost}/${NanoServerRepo}:${tag}
+FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json
index b89decb8a..9bdafd6be 100644
--- a/release/lts/nanoserver2022/meta.json
+++ b/release/lts/nanoserver2022/meta.json
@@ -19,6 +19,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }
diff --git a/release/lts/windowsservercore2022/docker/Dockerfile b/release/lts/windowsservercore2022/docker/Dockerfile
index 084354505..1a165d3e0 100644
--- a/release/lts/windowsservercore2022/docker/Dockerfile
+++ b/release/lts/windowsservercore2022/docker/Dockerfile
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json
index 2bb12640a..7fc9aec13 100644
--- a/release/lts/windowsservercore2022/meta.json
+++ b/release/lts/windowsservercore2022/meta.json
@@ -19,6 +19,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }
diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile
index 0ad72445d..c91928b83 100644
--- a/release/preview/nanoserver2022/docker/Dockerfile
+++ b/release/preview/nanoserver2022/docker/Dockerfile
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${dockerHost}/${NanoServerRepo}:${tag}
+FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
index e4553ab95..163b77f26 100644
--- a/release/preview/nanoserver2022/meta.json
+++ b/release/preview/nanoserver2022/meta.json
@@ -16,6 +16,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }
diff --git a/release/preview/windowsservercore2022/docker/Dockerfile b/release/preview/windowsservercore2022/docker/Dockerfile
index 084354505..1a165d3e0 100644
--- a/release/preview/windowsservercore2022/docker/Dockerfile
+++ b/release/preview/windowsservercore2022/docker/Dockerfile
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
index fb0577433..fb4fd04eb 100644
--- a/release/preview/windowsservercore2022/meta.json
+++ b/release/preview/windowsservercore2022/meta.json
@@ -16,6 +16,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }
diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile
index 0ad72445d..c91928b83 100644
--- a/release/stable/nanoserver2022/docker/Dockerfile
+++ b/release/stable/nanoserver2022/docker/Dockerfile
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
 
 # Install PowerShell into NanoServer
-FROM ${dockerHost}/${NanoServerRepo}:${tag}
+FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/stable/nanoserver2022/meta.json b/release/stable/nanoserver2022/meta.json
index 5fb0dab18..7dd344aaa 100644
--- a/release/stable/nanoserver2022/meta.json
+++ b/release/stable/nanoserver2022/meta.json
@@ -19,6 +19,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }
diff --git a/release/stable/windowsservercore2022/docker/Dockerfile b/release/stable/windowsservercore2022/docker/Dockerfile
index 084354505..1a165d3e0 100644
--- a/release/stable/windowsservercore2022/docker/Dockerfile
+++ b/release/stable/windowsservercore2022/docker/Dockerfile
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
 
 # Use server core as an installer container to extract PowerShell,
 # As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
@@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; `
     Expand-Archive powershell.zip -DestinationPath  \PowerShell
 
 # Install PowerShell into WindowsServerCore
-FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
 
 # Copy PowerShell Core from the installer container
 ENV ProgramFiles="C:\Program Files" `
diff --git a/release/stable/windowsservercore2022/meta.json b/release/stable/windowsservercore2022/meta.json
index d3335f497..1cc0b0a7f 100644
--- a/release/stable/windowsservercore2022/meta.json
+++ b/release/stable/windowsservercore2022/meta.json
@@ -19,6 +19,5 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true,
-    "IsPrivate": true
+    "UseAcr": true
 }

From 2b4ca76b64761d2ed1127ae2d147751a95413765 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 Aug 2021 16:01:34 -0700
Subject: [PATCH 143/354] update versions (#570)

---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 139db477b..f37dc573d 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: v7.2.0-preview.8
   - name: 'ltsReleaseTag'
-    default: v7.0.6
+    default: v7.0.7
   - name: 'stableReleaseTag'
-    default: v7.1.3
+    default: v7.1.4
 
 resources:
 - repo: self

From 99ed21ab057d49e0a395b82cb5c4c3ba748ac61b Mon Sep 17 00:00:00 2001
From: "Georgi N. Georgiev" <gngeorgiev.it@gmail.com>
Date: Sat, 11 Sep 2021 00:50:33 +0300
Subject: [PATCH 144/354] Add alpine 3.13.6 images (#575)

Co-authored-by: ggeorgiev_ <ggeorgiev@gitlab.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .github/dependabot.yml                        |  3 +-
 release/preview/alpine313/docker/Dockerfile   | 89 +++++++++++++++++++
 release/preview/alpine313/meta.json           | 18 ++++
 .../alpine313/test-deps/docker/Dockerfile     | 38 ++++++++
 release/preview/alpine313/test-deps/meta.json | 19 ++++
 release/stable/alpine313/docker/Dockerfile    | 87 ++++++++++++++++++
 release/stable/alpine313/meta.json            | 18 ++++
 .../alpine313/test-deps/docker/Dockerfile     | 38 ++++++++
 release/stable/alpine313/test-deps/meta.json  | 19 ++++
 9 files changed, 327 insertions(+), 2 deletions(-)
 create mode 100644 release/preview/alpine313/docker/Dockerfile
 create mode 100644 release/preview/alpine313/meta.json
 create mode 100644 release/preview/alpine313/test-deps/docker/Dockerfile
 create mode 100644 release/preview/alpine313/test-deps/meta.json
 create mode 100644 release/stable/alpine313/docker/Dockerfile
 create mode 100644 release/stable/alpine313/meta.json
 create mode 100644 release/stable/alpine313/test-deps/docker/Dockerfile
 create mode 100644 release/stable/alpine313/test-deps/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bda9ebac0..a6aa1721b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,9 +2,8 @@ version: 2
 
 # update_schedule: live is not supported by docker
 
-updates:
   - package-ecosystem: "docker"
-    directory: "/release/preview/alpine312/docker"
+    directory: "/release/preview/alpine313/docker"
     schedule:
       interval: "weekly"
 
diff --git a/release/preview/alpine313/docker/Dockerfile b/release/preview/alpine313/docker/Dockerfile
new file mode 100644
index 000000000..f914ea405
--- /dev/null
+++ b/release/preview/alpine313/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.13.6 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.13.6
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine313/meta.json b/release/preview/alpine313/meta.json
new file mode 100644
index 000000000..e446031e2
--- /dev/null
+++ b/release/preview/alpine313/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "preview-alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.13"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/preview/alpine313/test-deps/docker/Dockerfile b/release/preview/alpine313/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..04354944e
--- /dev/null
+++ b/release/preview/alpine313/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine313/test-deps/meta.json b/release/preview/alpine313/test-deps/meta.json
new file mode 100644
index 000000000..99b7b5f23
--- /dev/null
+++ b/release/preview/alpine313/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.13$" : "preview-alpine-3.13"
+    }
+}
diff --git a/release/stable/alpine313/docker/Dockerfile b/release/stable/alpine313/docker/Dockerfile
new file mode 100644
index 000000000..727eb5ae5
--- /dev/null
+++ b/release/stable/alpine313/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.13.6 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.13.6
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine313/meta.json b/release/stable/alpine313/meta.json
new file mode 100644
index 000000000..6f3aeb169
--- /dev/null
+++ b/release/stable/alpine313/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.13"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/stable/alpine313/test-deps/docker/Dockerfile b/release/stable/alpine313/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..04354944e
--- /dev/null
+++ b/release/stable/alpine313/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
+
+FROM node:14.3.0-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.3.0 \
+    YARN_VERSION=1.22.4 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine313/test-deps/meta.json b/release/stable/alpine313/test-deps/meta.json
new file mode 100644
index 000000000..99b7b5f23
--- /dev/null
+++ b/release/stable/alpine313/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.13$" : "preview-alpine-3.13"
+    }
+}

From f7ea6cbf77027f9e0791a1bab68782febb75c4bd Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 23 Sep 2021 13:49:31 -0400
Subject: [PATCH 145/354] Update node version in test-deps (#576)

---
 release/preview/alpine311/test-deps/docker/Dockerfile | 6 +++---
 release/preview/alpine312/test-deps/docker/Dockerfile | 6 +++---
 release/preview/alpine313/test-deps/docker/Dockerfile | 6 +++---
 release/stable/alpine311/test-deps/docker/Dockerfile  | 6 +++---
 release/stable/alpine312/test-deps/docker/Dockerfile  | 6 +++---
 release/stable/alpine313/test-deps/docker/Dockerfile  | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
index 85d48d3af..835eef9a6 100644
--- a/release/preview/alpine311/test-deps/docker/Dockerfile
+++ b/release/preview/alpine311/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
 
diff --git a/release/preview/alpine312/test-deps/docker/Dockerfile b/release/preview/alpine312/test-deps/docker/Dockerfile
index 57f3dbbaf..3d65429f0 100644
--- a/release/preview/alpine312/test-deps/docker/Dockerfile
+++ b/release/preview/alpine312/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
 
diff --git a/release/preview/alpine313/test-deps/docker/Dockerfile b/release/preview/alpine313/test-deps/docker/Dockerfile
index 04354944e..a95755d16 100644
--- a/release/preview/alpine313/test-deps/docker/Dockerfile
+++ b/release/preview/alpine313/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
 
diff --git a/release/stable/alpine311/test-deps/docker/Dockerfile b/release/stable/alpine311/test-deps/docker/Dockerfile
index 85d48d3af..835eef9a6 100644
--- a/release/stable/alpine311/test-deps/docker/Dockerfile
+++ b/release/stable/alpine311/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
 
diff --git a/release/stable/alpine312/test-deps/docker/Dockerfile b/release/stable/alpine312/test-deps/docker/Dockerfile
index 57f3dbbaf..3d65429f0 100644
--- a/release/stable/alpine312/test-deps/docker/Dockerfile
+++ b/release/stable/alpine312/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
 
diff --git a/release/stable/alpine313/test-deps/docker/Dockerfile b/release/stable/alpine313/test-deps/docker/Dockerfile
index 04354944e..a95755d16 100644
--- a/release/stable/alpine313/test-deps/docker/Dockerfile
+++ b/release/stable/alpine313/test-deps/docker/Dockerfile
@@ -2,14 +2,14 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
 
-FROM node:14.3.0-alpine as node
+FROM node:14.17.6-alpine as node
 
 # Do nothing, just added to borrow the already built node files.
 
 FROM ${BaseImage}
 
-ENV NODE_VERSION=14.3.0 \
-    YARN_VERSION=1.22.4 \
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
     NVM_DIR="/root/.nvm" \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
 

From 74573631b30b4cc8f1640373b1e73f2a698c005e Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 23 Sep 2021 13:52:14 -0400
Subject: [PATCH 146/354] add manifest list to 2022 preview images (#572)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/preview/nanoserver2022/meta.json        | 3 +++
 release/preview/windowsservercore2022/meta.json | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
index 163b77f26..9b65fc615 100644
--- a/release/preview/nanoserver2022/meta.json
+++ b/release/preview/nanoserver2022/meta.json
@@ -12,6 +12,9 @@
         "#psversion#-nanoserver-#shorttag#-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
+    "manifestLists": [
+        "preview-nanoserver"
+    ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
index fb4fd04eb..35763865b 100644
--- a/release/preview/windowsservercore2022/meta.json
+++ b/release/preview/windowsservercore2022/meta.json
@@ -7,6 +7,9 @@
             "Tag": "ltsc2022"
         }
     ],
+    "manifestLists": [
+        "preview"
+    ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",

From b9991c2569649a73c31d1d626d11342929ec3fef Mon Sep 17 00:00:00 2001
From: Sean Wheeler <sean.wheeler@microsoft.com>
Date: Sun, 3 Oct 2021 14:50:17 -0500
Subject: [PATCH 147/354] Change link to Windows Feedback Hub (#577)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9d56e9b5b..759b44399 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -13,7 +13,7 @@ If it's not a bug, please remove the template and elaborate the issue in your ow
 ## Check list
 
 - [ ] Verified that this is not a [Known Issue](https://github.com/PowerShell/PowerShell-Docker/wiki/Known-Issues)
-- [ ] Verified this is not an issues in the underlying windows container that should be reported to [Windows Container User Voice](https://windowsserver.uservoice.com/forums/304624-containers)
+- [ ] Verified this is not an issues in the underlying windows container that should be reported to [Windows Feedback Hub](https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332)
 
 ## Steps to reproduce
 <!-- Please include any docker commands you used to run the image -->

From 6222eac21a82eff66aedbbaa8951db9d43abc364 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Sun, 3 Oct 2021 17:08:37 -0400
Subject: [PATCH 148/354] Create 2022 server image (#573)

---
 .../lts/windowsserver2022/docker/Dockerfile   | 72 +++++++++++++++++++
 release/lts/windowsserver2022/meta.json       | 23 ++++++
 .../windowsserver2022/docker/Dockerfile       | 72 +++++++++++++++++++
 release/preview/windowsserver2022/meta.json   | 23 ++++++
 .../windowsserver2022/docker/Dockerfile       | 72 +++++++++++++++++++
 release/stable/windowsserver2022/meta.json    | 23 ++++++
 6 files changed, 285 insertions(+)
 create mode 100644 release/lts/windowsserver2022/docker/Dockerfile
 create mode 100644 release/lts/windowsserver2022/meta.json
 create mode 100644 release/preview/windowsserver2022/docker/Dockerfile
 create mode 100644 release/preview/windowsserver2022/meta.json
 create mode 100644 release/stable/windowsserver2022/docker/Dockerfile
 create mode 100644 release/stable/windowsserver2022/meta.json

diff --git a/release/lts/windowsserver2022/docker/Dockerfile b/release/lts/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/lts/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/lts/windowsserver2022/meta.json b/release/lts/windowsserver2022/meta.json
new file mode 100644
index 000000000..d9f4c7ef3
--- /dev/null
+++ b/release/lts/windowsserver2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "lts-#psversion#-windowsserver-#shorttag#",
+        "lts-windowsserver-#shorttag#",
+        "lts-windowsserver-#shorttag#-#fulltag#"
+    ],
+    "manifestLists": [
+        "lts"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/preview/windowsserver2022/docker/Dockerfile b/release/preview/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/preview/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/preview/windowsserver2022/meta.json b/release/preview/windowsserver2022/meta.json
new file mode 100644
index 000000000..652feb0fb
--- /dev/null
+++ b/release/preview/windowsserver2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsserver-#shorttag#",
+        "#psversion#-windowsserver-#shorttag#-#fulltag#",
+        "preview-windowsserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "preview-windowsserver"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/stable/windowsserver2022/docker/Dockerfile b/release/stable/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/stable/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/stable/windowsserver2022/meta.json b/release/stable/windowsserver2022/meta.json
new file mode 100644
index 000000000..da3e35cb8
--- /dev/null
+++ b/release/stable/windowsserver2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsserver-#shorttag#",
+        "#psversion#-windowsserver-#shorttag#-#fulltag#",
+        "windowsserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "windowsserver"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}

From eaf40c2ef22a3a345e0bf47bee28f8ef49aa829c Mon Sep 17 00:00:00 2001
From: Vincent Boulineau <58430298+vboulineau@users.noreply.github.com>
Date: Mon, 4 Oct 2021 22:21:48 +0200
Subject: [PATCH 149/354] Remove broken flag from 20H2 images as now supported
 by ACR (#578)

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
---
 release/lts/nanoserver20H2/meta.json            | 2 +-
 release/lts/windowsservercore20H2/meta.json     | 1 -
 release/preview/nanoserver20H2/meta.json        | 1 -
 release/preview/windowsservercore20H2/meta.json | 1 -
 release/stable/nanoserver20H2/meta.json         | 1 -
 release/stable/windowsservercore20H2/meta.json  | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/release/lts/nanoserver20H2/meta.json b/release/lts/nanoserver20H2/meta.json
index 7018ce5ca..7d69f2d91 100644
--- a/release/lts/nanoserver20H2/meta.json
+++ b/release/lts/nanoserver20H2/meta.json
@@ -16,5 +16,5 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
+    "IsBroken": false
 }
diff --git a/release/lts/windowsservercore20H2/meta.json b/release/lts/windowsservercore20H2/meta.json
index ba6d77343..c73832e77 100644
--- a/release/lts/windowsservercore20H2/meta.json
+++ b/release/lts/windowsservercore20H2/meta.json
@@ -16,5 +16,4 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
 }
diff --git a/release/preview/nanoserver20H2/meta.json b/release/preview/nanoserver20H2/meta.json
index 6291b9a07..d73b02076 100644
--- a/release/preview/nanoserver20H2/meta.json
+++ b/release/preview/nanoserver20H2/meta.json
@@ -17,5 +17,4 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
 }
diff --git a/release/preview/windowsservercore20H2/meta.json b/release/preview/windowsservercore20H2/meta.json
index 8e081cd19..3a60eb905 100644
--- a/release/preview/windowsservercore20H2/meta.json
+++ b/release/preview/windowsservercore20H2/meta.json
@@ -17,5 +17,4 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
 }
diff --git a/release/stable/nanoserver20H2/meta.json b/release/stable/nanoserver20H2/meta.json
index 2e712f41e..8b66993ba 100644
--- a/release/stable/nanoserver20H2/meta.json
+++ b/release/stable/nanoserver20H2/meta.json
@@ -17,5 +17,4 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
 }
diff --git a/release/stable/windowsservercore20H2/meta.json b/release/stable/windowsservercore20H2/meta.json
index 5a1f795bc..12a69024a 100644
--- a/release/stable/windowsservercore20H2/meta.json
+++ b/release/stable/windowsservercore20H2/meta.json
@@ -17,5 +17,4 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": true
 }

From 8cea04183fbde44d2c87758e9276ec7dbeaffd46 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 4 Oct 2021 17:42:49 -0700
Subject: [PATCH 150/354] Add workflow to update the release build parameters
 (#579)

---
 .github/workflows/update.yml | 52 +++++++++++++++++++++++
 tools/updateScript.ps1       | 82 ++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 .github/workflows/update.yml
 create mode 100644 tools/updateScript.ps1

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
new file mode 100644
index 000000000..585a0895b
--- /dev/null
+++ b/.github/workflows/update.yml
@@ -0,0 +1,52 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: Update Release Build Parameters
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '.github/workflows/update.yml'
+    branches:
+      - master
+      - add-gh-action
+  pull_request:
+    paths:
+      - '.github/workflows/update.yml'
+  schedule:
+    # At 20:20 UTC on every day-of-week from Monday through Friday.
+    - cron:  '0 0/4 * * *'
+defaults:
+  run:
+    shell: pwsh
+env:
+  UPDATE_SCRIPT_PATH: ./tools/updateScript.ps1
+jobs:
+  update-release-build-parameters:
+    name: Update Release Build Parameters
+    timeout-minutes: 15
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Auto-update formula
+        run: |
+          &$env:UPDATE_SCRIPT_PATH -FormulaPath $env:FORMULA_PATH -Channel $env:CHANNEL_NAME
+      - name: Create Pull Request
+        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+        id: cpr
+        uses: peter-evans/create-pull-request@v3
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          commit-message: "Update ${{ env.FORMULA_NAME}} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          assignees: travisez13
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-release-build
diff --git a/tools/updateScript.ps1 b/tools/updateScript.ps1
new file mode 100644
index 000000000..34cfde124
--- /dev/null
+++ b/tools/updateScript.ps1
@@ -0,0 +1,82 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+$yamlPath = "$psscriptroot\..\.vsts-ci/releasebuild.yml"
+$yaml = Get-Content -Path $yamlPath
+$defaults = $yaml | Select-String -Pattern '^\s* default:\s(v\d*\.\d*\.\d*(-\w*\.\d*)?)$'
+
+$retryCount = 3
+$retryIntervalSec = 15
+function Get-ChannelMeta {
+    param(
+        [ValidateSet('Stable', 'Preview', 'Lts', 'Daily')]
+        [string]
+        $Channel = 'Stable'
+    )
+
+    $urlTemplate = 'https://github.com/PowerShell/PowerShell/releases/download/v{0}/powershell-{0}-osx-x64.tar.gz'
+
+    switch ($Channel) {
+        'Stable' {
+            $metadata = Invoke-RestMethod 'https://aka.ms/pwsh-buildinfo-stable' -MaximumRetryCount $retryCount -RetryIntervalSec $retryIntervalSec
+        }
+        'Lts' {
+            $metadata = Invoke-RestMethod 'https://aka.ms/pwsh-buildinfo-lts' -MaximumRetryCount $retryCount -RetryIntervalSec $retryIntervalSec
+        }
+        'Preview' {
+            $metadata = Invoke-RestMethod 'https://aka.ms/pwsh-buildinfo-preview' -MaximumRetryCount $retryCount -RetryIntervalSec $retryIntervalSec
+        }
+        'Daily' {
+            $metadata = Invoke-RestMethod 'https://aka.ms/pwsh-buildinfo-Daily' -MaximumRetryCount $retryCount -RetryIntervalSec $retryIntervalSec
+            $urlTemplate = "https://pscoretestdata.blob.core.windows.net/$($metadata.blobname)/powershell-{0}-osx-x64.tar.gz"
+        }
+        default {
+            throw "Invalid channel: $Channel"
+        }
+    }
+
+    return [PSCustomObject]@{
+        MetaData    = $metadata
+        UrlTemplate = $urlTemplate
+    }
+}
+
+$updated = $false
+foreach ($default in $defaults) {
+    $existingReleaseTag = $default.Matches.groups[1]
+    $channel = switch -Regex ($existingReleaseTag) {
+        ('^v7\.0') {
+            "LTS"
+        }
+        ('^v7\.1') {
+            "Stable"
+        }
+        ('^v.*-preview\.\d*') {
+            "Preview"
+        }
+        default {
+            throw "Don't know the channel for $existingReleaseTag"
+        }
+    }
+    $meta = Get-ChannelMeta -Channel $channel
+    $newReleaseTag = $meta.metadata.ReleaseTag
+    $existingReleaseTagRegEx = [regex]::Escape($existingReleaseTag)
+    if ($existingReleaseTag.ToString() -ne $newReleaseTag.ToString()) {
+        Write-Verbose -Message "replacing '$existingReleaseTag' with '$newReleaseTag' - $($existingReleaseTag -ne $newReleaseTag)" -Verbose
+        $yaml = $yaml -replace $existingReleaseTag, $newReleaseTag
+        $updated = $true
+    }
+    # @{
+    #     ExistingReleaseTag = $existingReleaseTag
+    #     ExpectedReleaseTag = $newReleaseTag
+    #     Channel = $channel
+    #     Line = $default.Line
+    #     LineNumber = $default.LineNumber
+    # }
+}
+if ($updated) {
+    Write-Verbose "New Yaml (first 15 lines):" -Verbose
+    $yaml | Select-Object -First 15 | Write-Verbose -Verbose
+    Write-Verbose "Saving new yaml..." -Verbose
+    $yaml | Out-File -FilePath $yamlPath
+}

From c2d47d225b64db87bcec38ccf731da1bc23d6628 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 17:51:23 -0700
Subject: [PATCH 151/354] Update Release Build parameters (#580)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/releasebuild.yml |  2 +-
 vsts-ci.yml               | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index f37dc573d..0cdde40ee 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: v7.2.0-preview.8
+    default: v7.2.0-preview.10
   - name: 'ltsReleaseTag'
     default: v7.0.7
   - name: 'stableReleaseTag'
diff --git a/vsts-ci.yml b/vsts-ci.yml
index c57e3d29b..b054d2f4a 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -1,5 +1,18 @@
 name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
 
+pr:
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .github/*
+    - .vsts-ci/releasebuild.yml
+
 resources:
 - repo: self
   clean: true

From 2fa5dc94ec64007818cd758cd42194547e682f7e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 4 Oct 2021 17:57:43 -0700
Subject: [PATCH 152/354] Fix release build parameter PR description (#581)

---
 .github/workflows/update.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 585a0895b..c08073742 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -41,7 +41,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
-          commit-message: "Update ${{ env.FORMULA_NAME}} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          commit-message: "Update the release build yaml with the latest versions"
           committer: GitHub <noreply@github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"

From bf85157b80f22959a4666b23b300e816e2925384 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 15:15:30 -0700
Subject: [PATCH 153/354] Update  formula to version (#582)

* Update the release build yaml with the latest versions

* Update .vsts-ci/releasebuild.yml

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 0cdde40ee..db973a640 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: v7.2.0-preview.10
   - name: 'ltsReleaseTag'
-    default: v7.0.7
+    default: v7.0.8
   - name: 'stableReleaseTag'
-    default: v7.1.4
+    default: v7.1.5
 
 resources:
 - repo: self

From f976e18e09f60dd021a3c5d042c5cfb7603731d9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 21 Oct 2021 12:08:47 -0700
Subject: [PATCH 154/354] Fix lifecycle link (#584)

fixes #583
---
 docs/README.powershell.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.powershell.md b/docs/README.powershell.md
index a2fc169e0..92012e1ef 100644
--- a/docs/README.powershell.md
+++ b/docs/README.powershell.md
@@ -44,7 +44,7 @@ Tags go here.
 
 ## Support
 
-For our support policy, see [PowerShell Core Support Lifecycle](https://docs.microsoft.com/en-us/powershell/scripting/powershell-core-support)
+For our support policy, see [PowerShell Core Support Lifecycle](https://docs.microsoft.com/powershell/scripting/install/powershell-support-lifecycle?view=powershell-7.1)
 
 ## Feedback
 

From 45d96c55986e073e836896a2818f442c553ee808 Mon Sep 17 00:00:00 2001
From: "Georgi N. Georgiev" <gngeorgiev.it@gmail.com>
Date: Thu, 21 Oct 2021 22:15:20 +0300
Subject: [PATCH 155/354] Add alpine 3.14.2 images (#585)

Co-authored-by: ggeorgiev_ <ggeorgiev@gitlab.com>
---
 .github/dependabot.yml                        |  2 +-
 release/preview/alpine314/docker/Dockerfile   | 89 +++++++++++++++++++
 release/preview/alpine314/meta.json           | 18 ++++
 .../alpine314/test-deps/docker/Dockerfile     | 38 ++++++++
 release/preview/alpine314/test-deps/meta.json | 19 ++++
 release/stable/alpine314/docker/Dockerfile    | 87 ++++++++++++++++++
 release/stable/alpine314/meta.json            | 18 ++++
 .../alpine314/test-deps/docker/Dockerfile     | 38 ++++++++
 release/stable/alpine314/test-deps/meta.json  | 19 ++++
 9 files changed, 327 insertions(+), 1 deletion(-)
 create mode 100644 release/preview/alpine314/docker/Dockerfile
 create mode 100644 release/preview/alpine314/meta.json
 create mode 100644 release/preview/alpine314/test-deps/docker/Dockerfile
 create mode 100644 release/preview/alpine314/test-deps/meta.json
 create mode 100644 release/stable/alpine314/docker/Dockerfile
 create mode 100644 release/stable/alpine314/meta.json
 create mode 100644 release/stable/alpine314/test-deps/docker/Dockerfile
 create mode 100644 release/stable/alpine314/test-deps/meta.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a6aa1721b..d1c26437a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ version: 2
 # update_schedule: live is not supported by docker
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/alpine313/docker"
+    directory: "/release/preview/alpine314/docker"
     schedule:
       interval: "weekly"
 
diff --git a/release/preview/alpine314/docker/Dockerfile b/release/preview/alpine314/docker/Dockerfile
new file mode 100644
index 000000000..ea7cbe2a8
--- /dev/null
+++ b/release/preview/alpine314/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.14.2 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.14.2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine314/meta.json b/release/preview/alpine314/meta.json
new file mode 100644
index 000000000..22cda249a
--- /dev/null
+++ b/release/preview/alpine314/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "preview-alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.14"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/preview/alpine314/test-deps/docker/Dockerfile b/release/preview/alpine314/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1c4f46570
--- /dev/null
+++ b/release/preview/alpine314/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+    bash \
+    sudo \
+    shadow \
+    openssl \
+    curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/alpine314/test-deps/meta.json b/release/preview/alpine314/test-deps/meta.json
new file mode 100644
index 000000000..6e6446b4e
--- /dev/null
+++ b/release/preview/alpine314/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.14$" : "preview-alpine-3.14"
+    }
+}
diff --git a/release/stable/alpine314/docker/Dockerfile b/release/stable/alpine314/docker/Dockerfile
new file mode 100644
index 000000000..1a7482805
--- /dev/null
+++ b/release/stable/alpine314/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.14.2 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.14.2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine314/meta.json b/release/stable/alpine314/meta.json
new file mode 100644
index 000000000..b50c60bb8
--- /dev/null
+++ b/release/stable/alpine314/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.14"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/stable/alpine314/test-deps/docker/Dockerfile b/release/stable/alpine314/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1c4f46570
--- /dev/null
+++ b/release/stable/alpine314/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+    bash \
+    sudo \
+    shadow \
+    openssl \
+    curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/alpine314/test-deps/meta.json b/release/stable/alpine314/test-deps/meta.json
new file mode 100644
index 000000000..6e6446b4e
--- /dev/null
+++ b/release/stable/alpine314/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.14$" : "preview-alpine-3.14"
+    }
+}

From 4dbbcb15efd29eeda9c78eab6e8ef3890f41407c Mon Sep 17 00:00:00 2001
From: Erik <erik_renes@hotmail.com>
Date: Thu, 21 Oct 2021 22:58:20 +0200
Subject: [PATCH 156/354] Fix typo in Readme (#586)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ca825e153..547977b53 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ PowerShell is licensed under the [MIT license][].
 
 License: By requesting and using the Container OS Image for Windows containers, you acknowledge, understand, and consent to the Supplemental License Terms available on Docker hub:
 
-- [Window Server Core](https://hub.docker.com/r/microsoft/windowsservercore/)
+- [Windows Server Core](https://hub.docker.com/r/microsoft/windowsservercore/)
 - [Nano Server](https://hub.docker.com/r/microsoft/nanoserver/)
 
 ### Telemetry

From 43d1bd0026dd865bdcca809a2bb5c39fcfa28d1f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 30 Oct 2021 11:04:14 -0700
Subject: [PATCH 157/354] Update  release versions (#587)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .github/workflows/update.yml | 2 +-
 .vsts-ci/releasebuild.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index c08073742..ee070dfd0 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -44,7 +44,7 @@ jobs:
           commit-message: "Update the release build yaml with the latest versions"
           committer: GitHub <noreply@github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          title: "Update the release build yaml with the latest versions"
           assignees: travisez13
           reviewers: travisez13
           base: master
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index db973a640..4c573a90e 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: v7.2.0-preview.10
+    default: v7.2.0-rc.1
   - name: 'ltsReleaseTag'
     default: v7.0.8
   - name: 'stableReleaseTag'

From f72be26356c7c0fec7767fc792cdc946b1d660f9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 1 Nov 2021 10:44:37 -0700
Subject: [PATCH 158/354] Updated `releasebuild.yml` to use `ubuntu-latest`
 image (#589)

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 4c573a90e..efe2628f5 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -108,7 +108,7 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        name: Hosted Ubuntu 1604
+        vmImage: ubuntu-latest
         timeoutInMinutes: 30
 
       steps:

From 83a4a13d1599db58ae62c8111325eaf2afe15c0e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 2 Nov 2021 15:15:08 -0700
Subject: [PATCH 159/354] Get ready for 7.2 Release (#591)

---
 .vsts-ci/releasebuild.yml                     | 20 +++-
 release/7-1/alpine311/docker/Dockerfile       | 87 +++++++++++++++++
 release/7-1/alpine311/meta.json               | 18 ++++
 .../7-1/alpine311/test-deps/docker/Dockerfile | 38 ++++++++
 release/7-1/alpine311/test-deps/meta.json     | 19 ++++
 release/7-1/alpine312/docker/Dockerfile       | 87 +++++++++++++++++
 release/7-1/alpine312/meta.json               | 18 ++++
 .../7-1/alpine312/test-deps/docker/Dockerfile | 38 ++++++++
 release/7-1/alpine312/test-deps/meta.json     | 19 ++++
 release/7-1/alpine313/docker/Dockerfile       | 87 +++++++++++++++++
 release/7-1/alpine313/meta.json               | 18 ++++
 .../7-1/alpine313/test-deps/docker/Dockerfile | 38 ++++++++
 release/7-1/alpine313/test-deps/meta.json     | 19 ++++
 release/7-1/alpine314/docker/Dockerfile       | 87 +++++++++++++++++
 release/7-1/alpine314/meta.json               | 18 ++++
 .../7-1/alpine314/test-deps/docker/Dockerfile | 38 ++++++++
 release/7-1/alpine314/test-deps/meta.json     | 19 ++++
 release/7-1/arm32v7/docker/Dockerfile         | 70 ++++++++++++++
 release/7-1/arm32v7/meta.json                 | 21 ++++
 release/7-1/centos7/docker/Dockerfile         | 54 +++++++++++
 release/7-1/centos7/meta.json                 | 17 ++++
 .../7-1/centos7/test-deps/docker/Dockerfile   | 18 ++++
 release/7-1/centos7/test-deps/meta.json       | 15 +++
 release/7-1/centos8/docker/Dockerfile         | 56 +++++++++++
 release/7-1/centos8/meta.json                 | 17 ++++
 .../7-1/centos8/test-deps/docker/Dockerfile   | 18 ++++
 release/7-1/centos8/test-deps/meta.json       | 15 +++
 release/7-1/debian10/docker/Dockerfile        | 96 +++++++++++++++++++
 release/7-1/debian10/meta.json                | 21 ++++
 .../7-1/debian10/test-deps/docker/Dockerfile  | 22 +++++
 release/7-1/debian10/test-deps/meta.json      | 16 ++++
 release/7-1/debian11/docker/Dockerfile        | 95 ++++++++++++++++++
 release/7-1/debian11/meta.json                | 21 ++++
 .../7-1/debian11/test-deps/docker/Dockerfile  | 22 +++++
 release/7-1/debian11/test-deps/meta.json      | 16 ++++
 release/7-1/debian9/docker/Dockerfile         | 64 +++++++++++++
 release/7-1/debian9/meta.json                 | 20 ++++
 .../7-1/debian9/test-deps/docker/Dockerfile   | 22 +++++
 release/7-1/debian9/test-deps/meta.json       | 16 ++++
 release/7-1/fedora32/docker/Dockerfile        | 62 ++++++++++++
 release/7-1/fedora32/meta.json                | 19 ++++
 .../7-1/fedora32/test-deps/docker/Dockerfile  | 21 ++++
 release/7-1/fedora32/test-deps/meta.json      | 15 +++
 release/7-1/nanoserver1809/docker/Dockerfile  | 90 +++++++++++++++++
 release/7-1/nanoserver1809/meta.json          | 22 +++++
 release/7-1/nanoserver1909/docker/Dockerfile  | 90 +++++++++++++++++
 release/7-1/nanoserver1909/meta.json          | 23 +++++
 release/7-1/nanoserver2004/docker/Dockerfile  | 90 +++++++++++++++++
 release/7-1/nanoserver2004/meta.json          | 23 +++++
 release/7-1/nanoserver2022/docker/Dockerfile  | 92 ++++++++++++++++++
 release/7-1/nanoserver2022/meta.json          | 23 +++++
 release/7-1/nanoserver20H2/docker/Dockerfile  | 90 +++++++++++++++++
 release/7-1/nanoserver20H2/meta.json          | 20 ++++
 release/7-1/ubuntu16.04/docker/Dockerfile     | 60 ++++++++++++
 release/7-1/ubuntu16.04/meta.json             | 19 ++++
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ++++
 release/7-1/ubuntu16.04/test-deps/meta.json   | 16 ++++
 release/7-1/ubuntu18.04/docker/Dockerfile     | 60 ++++++++++++
 release/7-1/ubuntu18.04/meta.json             | 20 ++++
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ++++
 release/7-1/ubuntu18.04/test-deps/meta.json   | 16 ++++
 release/7-1/ubuntu20.04/docker/Dockerfile     | 94 ++++++++++++++++++
 release/7-1/ubuntu20.04/meta.json             | 23 +++++
 .../ubuntu20.04/test-deps/docker/Dockerfile   | 21 ++++
 release/7-1/ubuntu20.04/test-deps/meta.json   | 16 ++++
 .../7-1/windowsserver2022/docker/Dockerfile   | 72 ++++++++++++++
 release/7-1/windowsserver2022/meta.json       | 23 +++++
 .../windowsservercore1909/docker/Dockerfile   | 70 ++++++++++++++
 release/7-1/windowsservercore1909/meta.json   | 23 +++++
 .../windowsservercore2004/docker/Dockerfile   | 70 ++++++++++++++
 release/7-1/windowsservercore2004/meta.json   | 23 +++++
 .../windowsservercore2022/docker/Dockerfile   | 72 ++++++++++++++
 release/7-1/windowsservercore2022/meta.json   | 23 +++++
 .../windowsservercore20H2/docker/Dockerfile   | 70 ++++++++++++++
 release/7-1/windowsservercore20H2/meta.json   | 20 ++++
 .../amazonlinux/docker/Dockerfile             |  4 +-
 .../community-stable/amazonlinux/meta.json    |  2 +-
 release/lts/centos7/docker/Dockerfile         |  2 +-
 release/lts/centos7/meta.json                 |  2 +-
 release/lts/centos8/docker/Dockerfile         |  2 +-
 release/lts/centos8/meta.json                 |  2 +-
 release/lts/debian9/docker/Dockerfile         |  2 +-
 release/lts/debian9/meta.json                 |  2 +-
 release/lts/ubuntu16.04/docker/Dockerfile     |  2 +-
 release/lts/ubuntu16.04/meta.json             |  2 +-
 release/lts/ubuntu18.04/docker/Dockerfile     |  2 +-
 release/lts/ubuntu18.04/meta.json             |  2 +-
 release/preview/centos7/docker/Dockerfile     |  2 +-
 release/preview/centos8/docker/Dockerfile     |  2 +-
 release/preview/debian9/docker/Dockerfile     |  2 +-
 release/preview/fedora32/docker/Dockerfile    |  2 +-
 release/preview/fedora32/meta.json            |  1 +
 release/preview/ubuntu16.04/docker/Dockerfile |  2 +-
 release/preview/ubuntu16.04/meta.json         |  3 +-
 release/preview/ubuntu18.04/docker/Dockerfile |  2 +-
 release/servicing/centos7/docker/Dockerfile   |  2 +-
 release/servicing/centos7/meta.json           |  2 +-
 release/servicing/debian9/docker/Dockerfile   |  2 +-
 release/servicing/debian9/meta.json           |  2 +-
 .../servicing/ubuntu16.04/docker/Dockerfile   |  2 +-
 release/servicing/ubuntu16.04/meta.json       |  2 +-
 .../servicing/ubuntu18.04/docker/Dockerfile   |  2 +-
 release/servicing/ubuntu18.04/meta.json       |  2 +-
 release/stable/centos7/docker/Dockerfile      |  8 +-
 release/stable/centos7/meta.json              |  2 +-
 release/stable/centos8/docker/Dockerfile      |  2 +-
 release/stable/centos8/meta.json              |  2 +-
 release/stable/debian9/docker/Dockerfile      |  2 +-
 release/stable/debian9/meta.json              |  2 +-
 release/stable/fedora32/docker/Dockerfile     |  2 +-
 release/stable/fedora32/meta.json             |  4 +-
 release/stable/ubuntu16.04/docker/Dockerfile  |  2 +-
 release/stable/ubuntu16.04/meta.json          |  2 +-
 release/stable/ubuntu18.04/docker/Dockerfile  |  2 +-
 release/stable/ubuntu18.04/meta.json          |  2 +-
 .../unstable/oraclelinux/docker/Dockerfile    |  4 +-
 release/unstable/oraclelinux/meta.json        |  2 +-
 117 files changed, 2981 insertions(+), 48 deletions(-)
 create mode 100644 release/7-1/alpine311/docker/Dockerfile
 create mode 100644 release/7-1/alpine311/meta.json
 create mode 100644 release/7-1/alpine311/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/alpine311/test-deps/meta.json
 create mode 100644 release/7-1/alpine312/docker/Dockerfile
 create mode 100644 release/7-1/alpine312/meta.json
 create mode 100644 release/7-1/alpine312/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/alpine312/test-deps/meta.json
 create mode 100644 release/7-1/alpine313/docker/Dockerfile
 create mode 100644 release/7-1/alpine313/meta.json
 create mode 100644 release/7-1/alpine313/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/alpine313/test-deps/meta.json
 create mode 100644 release/7-1/alpine314/docker/Dockerfile
 create mode 100644 release/7-1/alpine314/meta.json
 create mode 100644 release/7-1/alpine314/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/alpine314/test-deps/meta.json
 create mode 100644 release/7-1/arm32v7/docker/Dockerfile
 create mode 100644 release/7-1/arm32v7/meta.json
 create mode 100644 release/7-1/centos7/docker/Dockerfile
 create mode 100644 release/7-1/centos7/meta.json
 create mode 100644 release/7-1/centos7/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/centos7/test-deps/meta.json
 create mode 100644 release/7-1/centos8/docker/Dockerfile
 create mode 100644 release/7-1/centos8/meta.json
 create mode 100644 release/7-1/centos8/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/centos8/test-deps/meta.json
 create mode 100644 release/7-1/debian10/docker/Dockerfile
 create mode 100644 release/7-1/debian10/meta.json
 create mode 100644 release/7-1/debian10/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/debian10/test-deps/meta.json
 create mode 100644 release/7-1/debian11/docker/Dockerfile
 create mode 100644 release/7-1/debian11/meta.json
 create mode 100644 release/7-1/debian11/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/debian11/test-deps/meta.json
 create mode 100644 release/7-1/debian9/docker/Dockerfile
 create mode 100644 release/7-1/debian9/meta.json
 create mode 100644 release/7-1/debian9/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/debian9/test-deps/meta.json
 create mode 100644 release/7-1/fedora32/docker/Dockerfile
 create mode 100644 release/7-1/fedora32/meta.json
 create mode 100644 release/7-1/fedora32/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/fedora32/test-deps/meta.json
 create mode 100755 release/7-1/nanoserver1809/docker/Dockerfile
 create mode 100644 release/7-1/nanoserver1809/meta.json
 create mode 100644 release/7-1/nanoserver1909/docker/Dockerfile
 create mode 100644 release/7-1/nanoserver1909/meta.json
 create mode 100644 release/7-1/nanoserver2004/docker/Dockerfile
 create mode 100644 release/7-1/nanoserver2004/meta.json
 create mode 100644 release/7-1/nanoserver2022/docker/Dockerfile
 create mode 100644 release/7-1/nanoserver2022/meta.json
 create mode 100644 release/7-1/nanoserver20H2/docker/Dockerfile
 create mode 100644 release/7-1/nanoserver20H2/meta.json
 create mode 100644 release/7-1/ubuntu16.04/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu16.04/meta.json
 create mode 100644 release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu16.04/test-deps/meta.json
 create mode 100644 release/7-1/ubuntu18.04/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu18.04/meta.json
 create mode 100644 release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu18.04/test-deps/meta.json
 create mode 100644 release/7-1/ubuntu20.04/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu20.04/meta.json
 create mode 100644 release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-1/ubuntu20.04/test-deps/meta.json
 create mode 100644 release/7-1/windowsserver2022/docker/Dockerfile
 create mode 100644 release/7-1/windowsserver2022/meta.json
 create mode 100644 release/7-1/windowsservercore1909/docker/Dockerfile
 create mode 100644 release/7-1/windowsservercore1909/meta.json
 create mode 100644 release/7-1/windowsservercore2004/docker/Dockerfile
 create mode 100644 release/7-1/windowsservercore2004/meta.json
 create mode 100644 release/7-1/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/7-1/windowsservercore2022/meta.json
 create mode 100644 release/7-1/windowsservercore20H2/docker/Dockerfile
 create mode 100644 release/7-1/windowsservercore20H2/meta.json

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index efe2628f5..3e8a52f78 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: v7.2.0-rc.1
   - name: 'ltsReleaseTag'
-    default: v7.0.8
+    default: v7.2.0
   - name: 'stableReleaseTag'
-    default: v7.1.5
+    default: v7.2.0
 
 resources:
 - repo: self
@@ -34,12 +34,28 @@ stages:
         timeoutInMinutes: 30
 
       steps:
+      - pwsh: |
+          if ($env:PREVIEWRELEASETAG -notmatch '^v\d+\.\d+\.\d+-(preview|rc)\.\d+$') {
+            throw "preview release tag is not for a preview build: '${env:PREVIEWRELEASETAG}'"
+          }
+        displayName: stop build if preview release tag does not match preview format
+      - pwsh: |
+          if ($env:STABLERELEASETAG -notmatch '^v\d+\.\d+\.\d+$') {
+            throw "stable release tag is not for a stable build: '${env:STABLERELEASETAG}'"
+          }
+        displayName: stop build if stable release tag does not match stable format
+      - pwsh: |
+          if ($env:LTSRELEASETAG -notmatch '^v\d+\.\d+\.\d+$') {
+            throw "LTS release tag is not for a stable build: '${env:LTSRELEASETAG}'"
+          }
+        displayName: stop build if LTS release tag does not match stable format
       - pwsh: |
           $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/BuildMeta.json'
           @{
             FullTag = (Get-Date).ToString("yyyyMMdd")
           } | ConvertTo-Json | Out-File -Encoding utf8NoBOM -FilePath ./BuildMeta.json
           Write-Host "##vso[artifact.upload containerfolder=buildMeta;artifactname=buildMeta]$path"
+        displayName: Create BuildMeta Json with FullTag
   - template: releaseStage.yml
     parameters:
       channel: stable
diff --git a/release/7-1/alpine311/docker/Dockerfile b/release/7-1/alpine311/docker/Dockerfile
new file mode 100644
index 000000000..82cccd512
--- /dev/null
+++ b/release/7-1/alpine311/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.11 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.11
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine311/meta.json b/release/7-1/alpine311/meta.json
new file mode 100644
index 000000000..4fafe0d29
--- /dev/null
+++ b/release/7-1/alpine311/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.11",
+    "tagTemplates": [
+        "#psversion#-alpine-3.11-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.11"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/7-1/alpine311/test-deps/docker/Dockerfile b/release/7-1/alpine311/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..835eef9a6
--- /dev/null
+++ b/release/7-1/alpine311/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine311/test-deps/meta.json b/release/7-1/alpine311/test-deps/meta.json
new file mode 100644
index 000000000..c2139fd9e
--- /dev/null
+++ b/release/7-1/alpine311/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.11",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.11$" : "alpine-3.11"
+    }
+}
diff --git a/release/7-1/alpine312/docker/Dockerfile b/release/7-1/alpine312/docker/Dockerfile
new file mode 100644
index 000000000..7b8e05a8c
--- /dev/null
+++ b/release/7-1/alpine312/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.12 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.12.1
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine312/meta.json b/release/7-1/alpine312/meta.json
new file mode 100644
index 000000000..6ed4aeb61
--- /dev/null
+++ b/release/7-1/alpine312/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.12"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/7-1/alpine312/test-deps/docker/Dockerfile b/release/7-1/alpine312/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..3d65429f0
--- /dev/null
+++ b/release/7-1/alpine312/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine312/test-deps/meta.json b/release/7-1/alpine312/test-deps/meta.json
new file mode 100644
index 000000000..49b703f2b
--- /dev/null
+++ b/release/7-1/alpine312/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.12",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.12$" : "preview-alpine-3.12"
+    }
+}
diff --git a/release/7-1/alpine313/docker/Dockerfile b/release/7-1/alpine313/docker/Dockerfile
new file mode 100644
index 000000000..727eb5ae5
--- /dev/null
+++ b/release/7-1/alpine313/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.13.6 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.13.6
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+    ca-certificates \
+    less \
+    \
+    # PSReadline/console dependencies
+    ncurses-terminfo-base \
+    \
+    # .NET Core dependencies
+    krb5-libs \
+    libgcc \
+    libintl \
+    libssl1.1 \
+    libstdc++ \
+    tzdata \
+    userspace-rcu \
+    zlib \
+    icu-libs \
+    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+    lttng-ust \
+    \
+    # PowerShell remoting over SSH dependencies
+    openssh-client \
+    \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine313/meta.json b/release/7-1/alpine313/meta.json
new file mode 100644
index 000000000..6f3aeb169
--- /dev/null
+++ b/release/7-1/alpine313/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.13"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/7-1/alpine313/test-deps/docker/Dockerfile b/release/7-1/alpine313/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..a95755d16
--- /dev/null
+++ b/release/7-1/alpine313/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine313/test-deps/meta.json b/release/7-1/alpine313/test-deps/meta.json
new file mode 100644
index 000000000..99b7b5f23
--- /dev/null
+++ b/release/7-1/alpine313/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.13",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.13$" : "preview-alpine-3.13"
+    }
+}
diff --git a/release/7-1/alpine314/docker/Dockerfile b/release/7-1/alpine314/docker/Dockerfile
new file mode 100644
index 000000000..1a7482805
--- /dev/null
+++ b/release/7-1/alpine314/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.14.2 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.14.2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine314/meta.json b/release/7-1/alpine314/meta.json
new file mode 100644
index 000000000..b50c60bb8
--- /dev/null
+++ b/release/7-1/alpine314/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "alpine-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "3.14"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    }
+}
diff --git a/release/7-1/alpine314/test-deps/docker/Dockerfile b/release/7-1/alpine314/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1c4f46570
--- /dev/null
+++ b/release/7-1/alpine314/test-deps/docker/Dockerfile
@@ -0,0 +1,38 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add \
+    bash \
+    sudo \
+    shadow \
+    openssl \
+    curl \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/alpine314/test-deps/meta.json b/release/7-1/alpine314/test-deps/meta.json
new file mode 100644
index 000000000..6e6446b4e
--- /dev/null
+++ b/release/7-1/alpine314/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "#tag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 295
+    },
+    "TagMapping": {
+        "^.*-alpine-3.14$" : "preview-alpine-3.14"
+    }
+}
diff --git a/release/7-1/arm32v7/docker/Dockerfile b/release/7-1/arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..840e68f81
--- /dev/null
+++ b/release/7-1/arm32v7/docker/Dockerfile
@@ -0,0 +1,70 @@
+# Copyright (c) Microsoft Corporation. 
+# Licensed under the MIT License.
+
+FROM arm32v7/ubuntu:bionic AS installer-env
+
+ARG PS_VERSION=6.2.3
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM arm32v7/ubuntu:bionic AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ARG PS_VERSION=6.2.3
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/arm32v7/meta.json b/release/7-1/arm32v7/meta.json
new file mode 100644
index 000000000..6cf0b1d21
--- /dev/null
+++ b/release/7-1/arm32v7/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 18.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "#psversion#-arm32v7-ubuntu-bionic-#fulltag#",
+        "#psversion#-arm32v7-ubuntu-18.04-#fulltag#",
+        "arm32v7-ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    }
+}
diff --git a/release/7-1/centos7/docker/Dockerfile b/release/7-1/centos7/docker/Dockerfile
new file mode 100644
index 000000000..13e534365
--- /dev/null
+++ b/release/7-1/centos7/docker/Dockerfile
@@ -0,0 +1,54 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM centos:7 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PACKAGE_VERSION=6.2.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/centos7/meta.json b/release/7-1/centos7/meta.json
new file mode 100644
index 000000000..4dac265f2
--- /dev/null
+++ b/release/7-1/centos7/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 7",
+    "tagTemplates": [
+        "#psversion#-centos-#shorttag#-#fulltag#",
+        "centos-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "7"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 550
+    }
+}
diff --git a/release/7-1/centos7/test-deps/docker/Dockerfile b/release/7-1/centos7/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..b41a2cefd
--- /dev/null
+++ b/release/7-1/centos7/test-deps/docker/Dockerfile
@@ -0,0 +1,18 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/centos7/test-deps/meta.json b/release/7-1/centos7/test-deps/meta.json
new file mode 100644
index 000000000..a6e148032
--- /dev/null
+++ b/release/7-1/centos7/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "CentOS 7",
+    "tagTemplates": [
+        "centos-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 575
+    }
+}
diff --git a/release/7-1/centos8/docker/Dockerfile b/release/7-1/centos8/docker/Dockerfile
new file mode 100644
index 000000000..ce04aa199
--- /dev/null
+++ b/release/7-1/centos8/docker/Dockerfile
@@ -0,0 +1,56 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM centos:8 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && yum install -y /tmp/powershell.rpm \
+    # Required for gssntlmssp
+    && yum install -y epel-release \
+    # Update now that we have epel-release
+    && yum update -y \
+    # Install libraries for NTLM support
+    && yum install -y \
+      gssntlmssp \
+      # less is required for help in powershell
+      less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
+      # PowerShell remoting over SSH dependencies
+      openssh-clients \
+    && yum upgrade-minimal -y --security \
+    && yum clean all \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/centos8/meta.json b/release/7-1/centos8/meta.json
new file mode 100644
index 000000000..b83c1c7ec
--- /dev/null
+++ b/release/7-1/centos8/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "#psversion#-centos-#shorttag#-#fulltag#",
+        "centos-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "8"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 725
+    }
+}
diff --git a/release/7-1/centos8/test-deps/docker/Dockerfile b/release/7-1/centos8/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..b41a2cefd
--- /dev/null
+++ b/release/7-1/centos8/test-deps/docker/Dockerfile
@@ -0,0 +1,18 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:centos-7
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/centos8/test-deps/meta.json b/release/7-1/centos8/test-deps/meta.json
new file mode 100644
index 000000000..55045a0b1
--- /dev/null
+++ b/release/7-1/centos8/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "CentOS 8",
+    "tagTemplates": [
+        "centos-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 750
+    }
+}
diff --git a/release/7-1/debian10/docker/Dockerfile b/release/7-1/debian10/docker/Dockerfile
new file mode 100644
index 000000000..35a48e07f
--- /dev/null
+++ b/release/7-1/debian10/docker/Dockerfile
@@ -0,0 +1,96 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG imageRepo=debian
+
+FROM ${imageRepo}:buster-slim AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.3
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ${imageRepo}:buster-slim
+
+ARG PS_VERSION=7.0.0
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian10/meta.json b/release/7-1/debian10/meta.json
new file mode 100644
index 000000000..7d70a28d4
--- /dev/null
+++ b/release/7-1/debian10/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 10",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
+        "debian-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "buster-slim"},
+        {"Tag": "10"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
+
diff --git a/release/7-1/debian10/test-deps/docker/Dockerfile b/release/7-1/debian10/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..63bec0248
--- /dev/null
+++ b/release/7-1/debian10/test-deps/docker/Dockerfile
@@ -0,0 +1,22 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-10
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian10/test-deps/meta.json b/release/7-1/debian10/test-deps/meta.json
new file mode 100644
index 000000000..36de679e8
--- /dev/null
+++ b/release/7-1/debian10/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 10",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/7-1/debian11/docker/Dockerfile b/release/7-1/debian11/docker/Dockerfile
new file mode 100644
index 000000000..5000c9940
--- /dev/null
+++ b/release/7-1/debian11/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+
+FROM debian:bullseye-slim AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.3
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM debian:bullseye-slim
+
+ARG PS_VERSION=6.2.0
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu67 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian11/meta.json b/release/7-1/debian11/meta.json
new file mode 100644
index 000000000..ab829767e
--- /dev/null
+++ b/release/7-1/debian11/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 11 (Testing)",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
+        "debian-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "bullseye-slim"},
+        {"Tag": "11"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 350
+    }
+}
+
diff --git a/release/7-1/debian11/test-deps/docker/Dockerfile b/release/7-1/debian11/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..96a8b9a38
--- /dev/null
+++ b/release/7-1/debian11/test-deps/docker/Dockerfile
@@ -0,0 +1,22 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-11
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian11/test-deps/meta.json b/release/7-1/debian11/test-deps/meta.json
new file mode 100644
index 000000000..424e8a54f
--- /dev/null
+++ b/release/7-1/debian11/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 11 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 350
+    }
+}
diff --git a/release/7-1/debian9/docker/Dockerfile b/release/7-1/debian9/docker/Dockerfile
new file mode 100644
index 000000000..67d72d712
--- /dev/null
+++ b/release/7-1/debian9/docker/Dockerfile
@@ -0,0 +1,64 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
+ARG imageRepo=debian
+
+FROM ${imageRepo}:stretch-slim AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian9/meta.json b/release/7-1/debian9/meta.json
new file mode 100644
index 000000000..aa3aa389e
--- /dev/null
+++ b/release/7-1/debian9/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
+    "osVersion": "Debian 9",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-debian-#shorttag#-#fulltag#",
+        "#psversion#-debian-#shorttag#",
+        "debian-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "stretch-slim"},
+        {"Tag": "9"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 314
+    }
+}
diff --git a/release/7-1/debian9/test-deps/docker/Dockerfile b/release/7-1/debian9/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..7ab3f2e17
--- /dev/null
+++ b/release/7-1/debian9/test-deps/docker/Dockerfile
@@ -0,0 +1,22 @@
+# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:debian-9
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/debian9/test-deps/meta.json b/release/7-1/debian9/test-deps/meta.json
new file mode 100644
index 000000000..79d8a0610
--- /dev/null
+++ b/release/7-1/debian9/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 9",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 316
+    }
+}
diff --git a/release/7-1/fedora32/docker/Dockerfile b/release/7-1/fedora32/docker/Dockerfile
new file mode 100644
index 000000000..71a2cff3a
--- /dev/null
+++ b/release/7-1/fedora32/docker/Dockerfile
@@ -0,0 +1,62 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
+ARG imageRepo=fedora
+
+FROM ${imageRepo}:32 AS installer-env
+
+ARG PS_VERSION=7.0.0
+ARG PACKAGE_VERSION=7.0.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
+
+# Install dependencies and clean up
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
+    && dnf install -y /tmp/powershell.rpm \
+    # remove powershell package
+    && rm /tmp/powershell.rpm \
+    && echo "starting misc packages" \
+    && dnf install -y \
+    # less is needed for help
+      less \
+    # Needed to run localdef
+      glibc-locale-source \
+    # Invoke-WebRequest doesn't work correctly without this
+      compat-openssl10 \
+      ca-certificates \
+      gssntlmssp \
+    && echo "end - misc packages" \
+    # This installs most security advisories
+    && echo "starting upgrade minimal" \
+    && dnf upgrade-minimal -y --security \
+    && echo "end - upgrade minimal" \
+    && echo "verifying all security advisories are installed..." \
+    && dnf updateinfo list -q --security \
+    && echo "end - verifying all security advisories are installed..." \
+    && dnf clean all \
+    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/fedora32/meta.json b/release/7-1/fedora32/meta.json
new file mode 100644
index 000000000..5e93a9423
--- /dev/null
+++ b/release/7-1/fedora32/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "osVersion": "Fedora 32",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-fedora-32-#fulltag#",
+        "#psversion#-fedora-32",
+        "fedora-32-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "32"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/7-1/fedora32/test-deps/docker/Dockerfile b/release/7-1/fedora32/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..d360aad2a
--- /dev/null
+++ b/release/7-1/fedora32/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:fedora-32
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN dnf install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps \
+        findutils \
+    && dnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/fedora32/test-deps/meta.json b/release/7-1/fedora32/test-deps/meta.json
new file mode 100644
index 000000000..6aa438d25
--- /dev/null
+++ b/release/7-1/fedora32/test-deps/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "osVersion": "Fedora 32",
+    "tagTemplates": [
+        "fedora-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 632
+    }
+}
diff --git a/release/7-1/nanoserver1809/docker/Dockerfile b/release/7-1/nanoserver1809/docker/Dockerfile
new file mode 100755
index 000000000..d71105565
--- /dev/null
+++ b/release/7-1/nanoserver1809/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1809
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver1809/meta.json b/release/7-1/nanoserver1809/meta.json
new file mode 100644
index 000000000..e6bd7be2b
--- /dev/null
+++ b/release/7-1/nanoserver1809/meta.json
@@ -0,0 +1,22 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1809",
+    "shortTags": [
+        {
+            "Tag": "1809"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1809-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    }
+}
diff --git a/release/7-1/nanoserver1909/docker/Dockerfile b/release/7-1/nanoserver1909/docker/Dockerfile
new file mode 100644
index 000000000..f46e57210
--- /dev/null
+++ b/release/7-1/nanoserver1909/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver1909/meta.json b/release/7-1/nanoserver1909/meta.json
new file mode 100644
index 000000000..64a57cf93
--- /dev/null
+++ b/release/7-1/nanoserver1909/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-1909-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/nanoserver2004/docker/Dockerfile b/release/7-1/nanoserver2004/docker/Dockerfile
new file mode 100644
index 000000000..e352e8f24
--- /dev/null
+++ b/release/7-1/nanoserver2004/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver2004/meta.json b/release/7-1/nanoserver2004/meta.json
new file mode 100644
index 000000000..4e891438e
--- /dev/null
+++ b/release/7-1/nanoserver2004/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-2004-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/nanoserver2022/docker/Dockerfile b/release/7-1/nanoserver2022/docker/Dockerfile
new file mode 100644
index 000000000..c91928b83
--- /dev/null
+++ b/release/7-1/nanoserver2022/docker/Dockerfile
@@ -0,0 +1,92 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG dockerHost=mcr.microsoft.com
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=windows/nanoserver
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver2022/meta.json b/release/7-1/nanoserver2022/meta.json
new file mode 100644
index 000000000..7dd344aaa
--- /dev/null
+++ b/release/7-1/nanoserver2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-#shorttag#-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "nanoserver"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/nanoserver20H2/docker/Dockerfile b/release/7-1/nanoserver20H2/docker/Dockerfile
new file mode 100644
index 000000000..db84868ed
--- /dev/null
+++ b/release/7-1/nanoserver20H2/docker/Dockerfile
@@ -0,0 +1,90 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Args used by from statements must be defined here:
+ARG InstallerVersion=nanoserver
+ARG InstallerRepo=mcr.microsoft.com/powershell
+ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
+
+# Arguments for installing PowerShell, must be defined in the container they are used
+ARG PS_VERSION=7.0.0
+
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
+
+SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# disable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="1"
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    New-Item -ItemType Directory /installer > $null ; `
+    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
+    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
+
+# Install PowerShell into NanoServer
+FROM ${NanoServerRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    # Set the default windows path so we can use it
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
+
+### Begin workaround ###
+# Note that changing user on nanoserver is not recommended
+# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
+# But we are working around a bug introduced in the nanoserver image introduced in 1809
+# Without this, PowerShell Direct will fail
+# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
+USER ContainerAdministrator
+
+# This is basically the correct code except for the /M
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
+
+USER ContainerUser
+### End workaround ###
+
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver20H2/meta.json b/release/7-1/nanoserver20H2/meta.json
new file mode 100644
index 000000000..8b66993ba
--- /dev/null
+++ b/release/7-1/nanoserver20H2/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Nano Server, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "tagTemplates": [
+        "#psversion#-nanoserver-#shorttag#",
+        "#psversion#-nanoserver-20H2-#fulltag#",
+        "nanoserver-#shorttag#"
+    ],
+    "Base64EncodePackageUrl": true,
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+}
diff --git a/release/7-1/ubuntu16.04/docker/Dockerfile b/release/7-1/ubuntu16.04/docker/Dockerfile
new file mode 100644
index 000000000..3829808b9
--- /dev/null
+++ b/release/7-1/ubuntu16.04/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
+
+FROM ubuntu:16.04 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu16.04/meta.json b/release/7-1/ubuntu16.04/meta.json
new file mode 100644
index 000000000..26182f14c
--- /dev/null
+++ b/release/7-1/ubuntu16.04/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "osVersion": "Ubuntu 16.04",
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "xenial"},
+        {"Tag": "16.04"}
+    ],
+    "SkipGssNtlmSspTests": false,
+    "TestProperties": {
+        "size": 395
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..6e8192a52
--- /dev/null
+++ b/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu16.04/test-deps/meta.json b/release/7-1/ubuntu16.04/test-deps/meta.json
new file mode 100644
index 000000000..8152d828e
--- /dev/null
+++ b/release/7-1/ubuntu16.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 16.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 399
+    }
+}
diff --git a/release/7-1/ubuntu18.04/docker/Dockerfile b/release/7-1/ubuntu18.04/docker/Dockerfile
new file mode 100644
index 000000000..7a300024b
--- /dev/null
+++ b/release/7-1/ubuntu18.04/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:18.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
+    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale \
+    # remove powershell package
+    && rm /tmp/powershell.deb \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu18.04/meta.json b/release/7-1/ubuntu18.04/meta.json
new file mode 100644
index 000000000..2286d5636
--- /dev/null
+++ b/release/7-1/ubuntu18.04/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "osVersion": "Ubuntu 18.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
+        "ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..47e76069d
--- /dev/null
+++ b/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu18.04/test-deps/meta.json b/release/7-1/ubuntu18.04/test-deps/meta.json
new file mode 100644
index 000000000..83453bb64
--- /dev/null
+++ b/release/7-1/ubuntu18.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 18.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/7-1/ubuntu20.04/docker/Dockerfile b/release/7-1/ubuntu20.04/docker/Dockerfile
new file mode 100644
index 000000000..1a831b710
--- /dev/null
+++ b/release/7-1/ubuntu20.04/docker/Dockerfile
@@ -0,0 +1,94 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.4
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=7.1.0
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu20.04/meta.json b/release/7-1/ubuntu20.04/meta.json
new file mode 100644
index 000000000..f3d26f4bb
--- /dev/null
+++ b/release/7-1/ubuntu20.04/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
+        "ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}
diff --git a/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..d9c7795a7
--- /dev/null
+++ b/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu20.04/test-deps/meta.json b/release/7-1/ubuntu20.04/test-deps/meta.json
new file mode 100644
index 000000000..b01cc7075
--- /dev/null
+++ b/release/7-1/ubuntu20.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}
diff --git a/release/7-1/windowsserver2022/docker/Dockerfile b/release/7-1/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/7-1/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsserver2022/meta.json b/release/7-1/windowsserver2022/meta.json
new file mode 100644
index 000000000..da3e35cb8
--- /dev/null
+++ b/release/7-1/windowsserver2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsserver-#shorttag#",
+        "#psversion#-windowsserver-#shorttag#-#fulltag#",
+        "windowsserver-#shorttag#"
+    ],
+    "manifestLists": [
+        "windowsserver"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/windowsservercore1909/docker/Dockerfile b/release/7-1/windowsservercore1909/docker/Dockerfile
new file mode 100644
index 000000000..354b9c209
--- /dev/null
+++ b/release/7-1/windowsservercore1909/docker/Dockerfile
@@ -0,0 +1,70 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:1909 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:1909
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore1909/meta.json b/release/7-1/windowsservercore1909/meta.json
new file mode 100644
index 000000000..fab03b5e4
--- /dev/null
+++ b/release/7-1/windowsservercore1909/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 1909",
+    "shortTags": [
+        {
+            "Tag": "1909"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-1909-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/windowsservercore2004/docker/Dockerfile b/release/7-1/windowsservercore2004/docker/Dockerfile
new file mode 100644
index 000000000..9c4a2f26a
--- /dev/null
+++ b/release/7-1/windowsservercore2004/docker/Dockerfile
@@ -0,0 +1,70 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:2004 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:2004
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore2004/meta.json b/release/7-1/windowsservercore2004/meta.json
new file mode 100644
index 000000000..3df98f9c3
--- /dev/null
+++ b/release/7-1/windowsservercore2004/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 2004",
+    "shortTags": [
+        {
+            "Tag": "2004"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-2004-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/windowsservercore2022/docker/Dockerfile b/release/7-1/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..1a165d3e0
--- /dev/null
+++ b/release/7-1/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore2022/meta.json b/release/7-1/windowsservercore2022/meta.json
new file mode 100644
index 000000000..1cc0b0a7f
--- /dev/null
+++ b/release/7-1/windowsservercore2022/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true
+}
diff --git a/release/7-1/windowsservercore20H2/docker/Dockerfile b/release/7-1/windowsservercore20H2/docker/Dockerfile
new file mode 100644
index 000000000..247cd3fef
--- /dev/null
+++ b/release/7-1/windowsservercore20H2/docker/Dockerfile
@@ -0,0 +1,70 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM ${WindowsServerCoreRepo}:20H2
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore20H2/meta.json b/release/7-1/windowsservercore20H2/meta.json
new file mode 100644
index 000000000..12a69024a
--- /dev/null
+++ b/release/7-1/windowsservercore20H2/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, version 20H2",
+    "shortTags": [
+        {
+            "Tag": "20H2"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "tagTemplates": [
+        "#psversion#-windowsservercore-#shorttag#",
+        "#psversion#-windowsservercore-20H2-#fulltag#",
+        "windowsservercore-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+}
diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile
index a60bd9848..dd21f68bf 100644
--- a/release/community-stable/amazonlinux/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Amazon Linux image with PowerShell
@@ -9,7 +9,7 @@ FROM amazonlinux:latest AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
diff --git a/release/community-stable/amazonlinux/meta.json b/release/community-stable/amazonlinux/meta.json
index ad85df91c..db14b863d 100644
--- a/release/community-stable/amazonlinux/meta.json
+++ b/release/community-stable/amazonlinux/meta.json
@@ -1,6 +1,6 @@
 {
     "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": false,
     "shortTags": [
         {"Tag": "latest"}
diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
index a661a118e..07bc762f3 100644
--- a/release/lts/centos7/docker/Dockerfile
+++ b/release/lts/centos7/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM centos:7 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
index 689baf1a3..07ee7c277 100644
--- a/release/lts/centos7/meta.json
+++ b/release/lts/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "lts-centos-#shorttag#"
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
index 57dd452e5..ddcfcd9ae 100644
--- a/release/lts/centos8/docker/Dockerfile
+++ b/release/lts/centos8/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/lts/centos8/meta.json b/release/lts/centos8/meta.json
index 6b7fdccd7..0e8fa2a94 100644
--- a/release/lts/centos8/meta.json
+++ b/release/lts/centos8/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 8",
     "tagTemplates": [
         "lts-centos-#shorttag#"
diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
index f292b6dd3..b3fa55a9e 100644
--- a/release/lts/debian9/docker/Dockerfile
+++ b/release/lts/debian9/docker/Dockerfile
@@ -4,7 +4,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/lts/debian9/meta.json b/release/lts/debian9/meta.json
index c7979ff78..8ef40ce93 100644
--- a/release/lts/debian9/meta.json
+++ b/release/lts/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb",
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
index 7bb04918c..6cc556711 100644
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ b/release/lts/ubuntu16.04/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/lts/ubuntu16.04/meta.json b/release/lts/ubuntu16.04/meta.json
index f4fb847b9..1317249c5 100644
--- a/release/lts/ubuntu16.04/meta.json
+++ b/release/lts/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
index 149833278..96802b615 100644
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ b/release/lts/ubuntu18.04/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:18.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
index 30d3be4eb..b0036152c 100644
--- a/release/lts/ubuntu18.04/meta.json
+++ b/release/lts/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
index 05385371c..347cd51c8 100644
--- a/release/preview/centos7/docker/Dockerfile
+++ b/release/preview/centos7/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM centos:7 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
index c0fb8041e..bb6566e7d 100644
--- a/release/preview/centos8/docker/Dockerfile
+++ b/release/preview/centos8/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
index 34fdfed06..5c6c9d7e5 100644
--- a/release/preview/debian9/docker/Dockerfile
+++ b/release/preview/debian9/docker/Dockerfile
@@ -7,7 +7,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/preview/fedora32/docker/Dockerfile b/release/preview/fedora32/docker/Dockerfile
index 66f9e665b..3fd7ff31d 100644
--- a/release/preview/fedora32/docker/Dockerfile
+++ b/release/preview/fedora32/docker/Dockerfile
@@ -8,7 +8,7 @@ FROM ${imageRepo}:32 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 
diff --git a/release/preview/fedora32/meta.json b/release/preview/fedora32/meta.json
index b5a25311b..501bff419 100644
--- a/release/preview/fedora32/meta.json
+++ b/release/preview/fedora32/meta.json
@@ -6,6 +6,7 @@
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-32-#fulltag#",
+        "#psversion#-fedora-32",
         "preview-fedora-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile
index 03dd1e6c4..ef0c694a8 100644
--- a/release/preview/ubuntu16.04/docker/Dockerfile
+++ b/release/preview/ubuntu16.04/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 2f090477f..803e98cc4 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -8,7 +8,8 @@
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "xenial"}
+        {"Tag": "xenial"},
+        {"Tag": "16.04"}
     ],
     "SkipGssNtlmSspTests": false,
     "TestProperties": {
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 5728e0654..589a4902a 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:18.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
index d62030878..9d9a2b45a 100644
--- a/release/servicing/centos7/docker/Dockerfile
+++ b/release/servicing/centos7/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0
 ARG PACKAGE_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/servicing/centos7/meta.json b/release/servicing/centos7/meta.json
index d3a835965..f8ee0aef7 100644
--- a/release/servicing/centos7/meta.json
+++ b/release/servicing/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#tag#"
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
index 53f5282dd..61247f190 100644
--- a/release/servicing/debian9/docker/Dockerfile
+++ b/release/servicing/debian9/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/servicing/debian9/meta.json b/release/servicing/debian9/meta.json
index e761f39a9..6649f1ccb 100644
--- a/release/servicing/debian9/meta.json
+++ b/release/servicing/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.debian.9_amd64.deb",
+    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
index 8251478fb..d513284a3 100644
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ b/release/servicing/ubuntu16.04/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG imageRepo=ubuntu
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/servicing/ubuntu16.04/meta.json b/release/servicing/ubuntu16.04/meta.json
index 2f91ae543..33e104bbe 100644
--- a/release/servicing/ubuntu16.04/meta.json
+++ b/release/servicing/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-#tag#"
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
index 2c1ae75d2..2cf142f6d 100644
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ b/release/servicing/ubuntu18.04/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG imageRepo=ubuntu
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/servicing/ubuntu18.04/meta.json b/release/servicing/ubuntu18.04/meta.json
index a4367ebe2..3501965fd 100644
--- a/release/servicing/ubuntu18.04/meta.json
+++ b/release/servicing/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
index 13e534365..429c4feee 100644
--- a/release/stable/centos7/docker/Dockerfile
+++ b/release/stable/centos7/docker/Dockerfile
@@ -3,9 +3,9 @@
 
 FROM centos:7 AS installer-env
 
-ARG PS_VERSION=6.2.0
-ARG PACKAGE_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_VERSION=7.2.0
+ARG PACKAGE_VERSION=7.2.0
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
@@ -28,6 +28,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       gssntlmssp \
       # less is required for help in powershell
       less \
+      # clear is part of ncurses which is used by clear
+      ncurses \
       # PowerShell remoting over SSH dependencies
       openssh-clients \
     && yum upgrade-minimal -y --security \
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index 4dac265f2..fa2a64144 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#shorttag#-#fulltag#",
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
index ce04aa199..0cfeec84a 100644
--- a/release/stable/centos8/docker/Dockerfile
+++ b/release/stable/centos8/docker/Dockerfile
@@ -5,7 +5,7 @@ FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
index b83c1c7ec..8495ad2b0 100644
--- a/release/stable/centos8/meta.json
+++ b/release/stable/centos8/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 8",
     "tagTemplates": [
         "#psversion#-centos-#shorttag#-#fulltag#",
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
index 67d72d712..45db57bdc 100644
--- a/release/stable/debian9/docker/Dockerfile
+++ b/release/stable/debian9/docker/Dockerfile
@@ -7,7 +7,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:stretch-slim AS installer-env
 
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/stable/debian9/meta.json b/release/stable/debian9/meta.json
index aa3aa389e..d4f3d28ae 100644
--- a/release/stable/debian9/meta.json
+++ b/release/stable/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/fedora32/docker/Dockerfile b/release/stable/fedora32/docker/Dockerfile
index 71a2cff3a..c1b14a603 100644
--- a/release/stable/fedora32/docker/Dockerfile
+++ b/release/stable/fedora32/docker/Dockerfile
@@ -8,7 +8,7 @@ FROM ${imageRepo}:32 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 
diff --git a/release/stable/fedora32/meta.json b/release/stable/fedora32/meta.json
index 5e93a9423..ab62b52e8 100644
--- a/release/stable/fedora32/meta.json
+++ b/release/stable/fedora32/meta.json
@@ -1,13 +1,13 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-32-#fulltag#",
         "#psversion#-fedora-32",
-        "fedora-32-#shorttag#"
+        "fedora-#shorttag#"
     ],
     "shortTags": [
         {"Tag": "32"}
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/stable/ubuntu16.04/docker/Dockerfile
index 3829808b9..da904032e 100644
--- a/release/stable/ubuntu16.04/docker/Dockerfile
+++ b/release/stable/ubuntu16.04/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index 26182f14c..b41a0cf42 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-#shorttag#-#fulltag#",
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/stable/ubuntu18.04/docker/Dockerfile
index 7a300024b..72cd2c65f 100644
--- a/release/stable/ubuntu18.04/docker/Dockerfile
+++ b/release/stable/ubuntu18.04/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:18.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
 # Define ENVs for Localization/Globalization
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index 2286d5636..f82c093ce 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
+    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile
index 6bbb0dc14..29246163b 100644
--- a/release/unstable/oraclelinux/docker/Dockerfile
+++ b/release/unstable/oraclelinux/docker/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Oracle Linux image with PowerShell
@@ -9,7 +9,7 @@ FROM oraclelinux:8.3 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm
+ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
diff --git a/release/unstable/oraclelinux/meta.json b/release/unstable/oraclelinux/meta.json
index aeb76d4a2..591dc7a06 100644
--- a/release/unstable/oraclelinux/meta.json
+++ b/release/unstable/oraclelinux/meta.json
@@ -1,6 +1,6 @@
 {
     "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": false,
     "shortTags": [
         {"Tag": "8.3"}

From 9a84bd7ea0a72cff0d4e67ad2c7ac235f9e9ed9c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 4 Nov 2021 07:51:48 -0700
Subject: [PATCH 160/354] make rc recognize as a preview

---
 tools/updateScript.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/updateScript.ps1 b/tools/updateScript.ps1
index 34cfde124..c9004df54 100644
--- a/tools/updateScript.ps1
+++ b/tools/updateScript.ps1
@@ -51,7 +51,7 @@ foreach ($default in $defaults) {
         ('^v7\.1') {
             "Stable"
         }
-        ('^v.*-preview\.\d*') {
+        ('^v.*-(preview|rc)\.\d*') {
             "Preview"
         }
         default {

From 80905f72a6e5bd9c838322c116146142ad4d8ccd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 4 Nov 2021 07:59:39 -0700
Subject: [PATCH 161/354] fix LTS match code

---
 tools/updateScript.ps1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/updateScript.ps1 b/tools/updateScript.ps1
index c9004df54..b04fc6d16 100644
--- a/tools/updateScript.ps1
+++ b/tools/updateScript.ps1
@@ -45,10 +45,12 @@ $updated = $false
 foreach ($default in $defaults) {
     $existingReleaseTag = $default.Matches.groups[1]
     $channel = switch -Regex ($existingReleaseTag) {
-        ('^v7\.0') {
+        ('^v7\.[02468]\.\d+$') {
             "LTS"
+            # Don't also match stable
+            continue
         }
-        ('^v7\.1') {
+        ('^v7\.\d+.\d+$') {
             "Stable"
         }
         ('^v.*-(preview|rc)\.\d*') {

From 62d4e2640ef5523794d6e880f2c7b64d31e5184a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Nov 2021 14:30:20 -0700
Subject: [PATCH 162/354] Update the release build yaml with the latest
 versions (#597)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis@ez13.net>
---
 .vsts-ci/releasebuild.yml |  6 +++---
 tools/updateScript.ps1    | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3e8a52f78..79519171a 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: v7.2.0-rc.1
+    default: 'v7.2.0-rc.1'
   - name: 'ltsReleaseTag'
-    default: v7.2.0
+    default: 'v7.2.0'
   - name: 'stableReleaseTag'
-    default: v7.2.0
+    default: 'v7.2.0'
 
 resources:
 - repo: self
diff --git a/tools/updateScript.ps1 b/tools/updateScript.ps1
index b04fc6d16..afea14542 100644
--- a/tools/updateScript.ps1
+++ b/tools/updateScript.ps1
@@ -3,7 +3,7 @@
 
 $yamlPath = "$psscriptroot\..\.vsts-ci/releasebuild.yml"
 $yaml = Get-Content -Path $yamlPath
-$defaults = $yaml | Select-String -Pattern '^\s* default:\s(v\d*\.\d*\.\d*(-\w*\.\d*)?)$'
+$defaults = $yaml | Select-String -Pattern '^\s* default:\s''(v\d*\.\d*\.\d*(-\w*\.\d*)?)''$'
 
 $retryCount = 3
 $retryIntervalSec = 15
@@ -43,6 +43,7 @@ function Get-ChannelMeta {
 
 $updated = $false
 foreach ($default in $defaults) {
+    Write-Verbose "Updating $default" -Verbose
     $existingReleaseTag = $default.Matches.groups[1]
     $channel = switch -Regex ($existingReleaseTag) {
         ('^v7\.[02468]\.\d+$') {
@@ -64,9 +65,16 @@ foreach ($default in $defaults) {
     $newReleaseTag = $meta.metadata.ReleaseTag
     $existingReleaseTagRegEx = [regex]::Escape($existingReleaseTag)
     if ($existingReleaseTag.ToString() -ne $newReleaseTag.ToString()) {
-        Write-Verbose -Message "replacing '$existingReleaseTag' with '$newReleaseTag' - $($existingReleaseTag -ne $newReleaseTag)" -Verbose
-        $yaml = $yaml -replace $existingReleaseTag, $newReleaseTag
-        $updated = $true
+        [System.Management.Automation.SemanticVersion] $existingVersion = $existingReleaseTag -replace '^v', ''
+        [System.Management.Automation.SemanticVersion]$newVersion = $newReleaseTag -replace '^v', ''
+        if ($newVersion -gt $existingVersion) {
+            Write-Verbose -Message "replacing '$existingReleaseTag' with '$newReleaseTag' - $($existingReleaseTag -ne $newReleaseTag)" -Verbose
+            $yaml = $yaml -replace $existingReleaseTagRegEx, $newReleaseTag
+            $updated = $true
+        }
+        else {
+            Write-Verbose -Message "Skipping '$existingReleaseTag' newer than $newReleaseTag" -Verbose
+        }
     }
     # @{
     #     ExistingReleaseTag = $existingReleaseTag

From 7b3f97b96922198dbfd977c3a47e857be5ac75ad Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 11 Nov 2021 15:32:42 -0800
Subject: [PATCH 163/354] Fix alpine missing test-deps (#599)

---
 release/lts/centos7/meta.json                 | 2 +-
 release/lts/centos7/test-deps/meta.json       | 2 +-
 release/preview/alpine311/test-deps/meta.json | 5 +----
 release/preview/alpine312/test-deps/meta.json | 5 +----
 release/preview/alpine313/test-deps/meta.json | 5 +----
 release/preview/alpine314/test-deps/meta.json | 5 +----
 release/stable/centos7/meta.json              | 2 +-
 release/stable/centos7/test-deps/meta.json    | 2 +-
 tools/buildHelper/buildHelper.psm1            | 2 +-
 vsts-ci.yml                                   | 3 ++-
 10 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
index 07ee7c277..7db53ca58 100644
--- a/release/lts/centos7/meta.json
+++ b/release/lts/centos7/meta.json
@@ -11,6 +11,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 585
     }
 }
diff --git a/release/lts/centos7/test-deps/meta.json b/release/lts/centos7/test-deps/meta.json
index 67a1db271..141cac396 100644
--- a/release/lts/centos7/test-deps/meta.json
+++ b/release/lts/centos7/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 610
     }
 }
diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
index f2a75ed8c..1d7023a59 100644
--- a/release/preview/alpine311/test-deps/meta.json
+++ b/release/preview/alpine311/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.11",
     "tagTemplates": [
-        "#tag#"
+        "preview-alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
@@ -12,8 +12,5 @@
     ],
     "TestProperties": {
         "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.11$" : "preview-alpine-3.11"
     }
 }
diff --git a/release/preview/alpine312/test-deps/meta.json b/release/preview/alpine312/test-deps/meta.json
index 49b703f2b..8ceaedf95 100644
--- a/release/preview/alpine312/test-deps/meta.json
+++ b/release/preview/alpine312/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.12",
     "tagTemplates": [
-        "#tag#"
+        "preview-alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
@@ -12,8 +12,5 @@
     ],
     "TestProperties": {
         "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.12$" : "preview-alpine-3.12"
     }
 }
diff --git a/release/preview/alpine313/test-deps/meta.json b/release/preview/alpine313/test-deps/meta.json
index 99b7b5f23..4a4719819 100644
--- a/release/preview/alpine313/test-deps/meta.json
+++ b/release/preview/alpine313/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "#tag#"
+        "preview-alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
@@ -12,8 +12,5 @@
     ],
     "TestProperties": {
         "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.13$" : "preview-alpine-3.13"
     }
 }
diff --git a/release/preview/alpine314/test-deps/meta.json b/release/preview/alpine314/test-deps/meta.json
index 6e6446b4e..e869ead84 100644
--- a/release/preview/alpine314/test-deps/meta.json
+++ b/release/preview/alpine314/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "#tag#"
+        "preview-alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
@@ -12,8 +12,5 @@
     ],
     "TestProperties": {
         "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.14$" : "preview-alpine-3.14"
     }
 }
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index fa2a64144..4ccc7ff77 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -12,6 +12,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 577
     }
 }
diff --git a/release/stable/centos7/test-deps/meta.json b/release/stable/centos7/test-deps/meta.json
index a6e148032..2f999f04b 100644
--- a/release/stable/centos7/test-deps/meta.json
+++ b/release/stable/centos7/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 605
     }
 }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 5f7dd12c0..c3be4919c 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -54,7 +54,7 @@ function Get-PowerShellVersion
             $metaData.ServicingReleaseTag
         }
         elseif ($Lts.IsPresent) {
-            $ltsReleaseTag = $metaData.LtsReleaseTag
+            $ltsReleaseTag = $metaData.LtsReleaseTag[0]
             if (-not $ltsReleaseTag) {
                 $metaData.PreviewReleaseTag
             }
diff --git a/vsts-ci.yml b/vsts-ci.yml
index b054d2f4a..94797f75f 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -56,7 +56,8 @@ stages:
     dependsOn: []
     jobs:
     - job: Secret_Scan
-      pool: 'Hosted VS2017'
+      pool:
+        vmImage: windows-latest
       displayName: Secret Scan
 
       steps:

From df2aaa3e32d2dcab4b6ca2645db9cb77d275112e Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 16 Nov 2021 10:49:50 -0700
Subject: [PATCH 164/354] Fix Missing Test-Deps tags for alpine stable images
 (#602)

fix tags for alpine stable, remove patch version for all alpine, remove alpine 311 which is eol
---
 .../preview/alpine311/dependabot/Dockerfile   |  6 --
 release/preview/alpine311/docker/Dockerfile   | 89 -------------------
 release/preview/alpine311/meta.json           | 18 ----
 .../alpine311/test-deps/docker/Dockerfile     | 38 --------
 release/preview/alpine311/test-deps/meta.json | 16 ----
 release/preview/alpine312/docker/Dockerfile   |  2 +-
 release/preview/alpine313/docker/Dockerfile   |  4 +-
 .../alpine313/test-deps/docker/Dockerfile     |  2 +-
 release/preview/alpine313/test-deps/meta.json |  2 +-
 release/preview/alpine314/docker/Dockerfile   |  4 +-
 .../alpine314/test-deps/docker/Dockerfile     |  2 +-
 release/preview/alpine314/test-deps/meta.json |  2 +-
 release/stable/alpine311/docker/Dockerfile    | 87 ------------------
 release/stable/alpine311/meta.json            | 18 ----
 .../alpine311/test-deps/docker/Dockerfile     | 38 --------
 release/stable/alpine311/test-deps/meta.json  | 19 ----
 release/stable/alpine312/docker/Dockerfile    |  2 +-
 release/stable/alpine312/test-deps/meta.json  |  7 +-
 release/stable/alpine313/docker/Dockerfile    |  4 +-
 .../alpine313/test-deps/docker/Dockerfile     |  2 +-
 release/stable/alpine313/test-deps/meta.json  |  7 +-
 release/stable/alpine314/docker/Dockerfile    |  4 +-
 .../alpine314/test-deps/docker/Dockerfile     |  2 +-
 release/stable/alpine314/test-deps/meta.json  |  7 +-
 24 files changed, 22 insertions(+), 360 deletions(-)
 delete mode 100644 release/preview/alpine311/dependabot/Dockerfile
 delete mode 100644 release/preview/alpine311/docker/Dockerfile
 delete mode 100644 release/preview/alpine311/meta.json
 delete mode 100644 release/preview/alpine311/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/alpine311/test-deps/meta.json
 delete mode 100644 release/stable/alpine311/docker/Dockerfile
 delete mode 100644 release/stable/alpine311/meta.json
 delete mode 100644 release/stable/alpine311/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/alpine311/test-deps/meta.json

diff --git a/release/preview/alpine311/dependabot/Dockerfile b/release/preview/alpine311/dependabot/Dockerfile
deleted file mode 100644
index b39d2c5c7..000000000
--- a/release/preview/alpine311/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM alpine:3.11.3
diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile
deleted file mode 100644
index 59f413e2a..000000000
--- a/release/preview/alpine311/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.11 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.11
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json
deleted file mode 100644
index 470d8dcc0..000000000
--- a/release/preview/alpine311/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
-        "preview-alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.11"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/preview/alpine311/test-deps/docker/Dockerfile b/release/preview/alpine311/test-deps/docker/Dockerfile
deleted file mode 100644
index 835eef9a6..000000000
--- a/release/preview/alpine311/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/alpine311/test-deps/meta.json b/release/preview/alpine311/test-deps/meta.json
deleted file mode 100644
index 1d7023a59..000000000
--- a/release/preview/alpine311/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    }
-}
diff --git a/release/preview/alpine312/docker/Dockerfile b/release/preview/alpine312/docker/Dockerfile
index 659f3f22c..174fa19db 100644
--- a/release/preview/alpine312/docker/Dockerfile
+++ b/release/preview/alpine312/docker/Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.12.1
+FROM alpine:3.12
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/preview/alpine313/docker/Dockerfile b/release/preview/alpine313/docker/Dockerfile
index f914ea405..9f7de89e0 100644
--- a/release/preview/alpine313/docker/Dockerfile
+++ b/release/preview/alpine313/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.13.6 AS installer-env
+FROM alpine:3.13 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-preview.1
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.13.6
+FROM alpine:3.13
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/preview/alpine313/test-deps/docker/Dockerfile b/release/preview/alpine313/test-deps/docker/Dockerfile
index a95755d16..02d7b1b60 100644
--- a/release/preview/alpine313/test-deps/docker/Dockerfile
+++ b/release/preview/alpine313/test-deps/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Docker image file that describes an Alpine image with PowerShell and test dependencies
 
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
 
 FROM node:14.17.6-alpine as node
 
diff --git a/release/preview/alpine313/test-deps/meta.json b/release/preview/alpine313/test-deps/meta.json
index 4a4719819..2c4f23f5e 100644
--- a/release/preview/alpine313/test-deps/meta.json
+++ b/release/preview/alpine313/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
+        "size": 335
     }
 }
diff --git a/release/preview/alpine314/docker/Dockerfile b/release/preview/alpine314/docker/Dockerfile
index ea7cbe2a8..017f97961 100644
--- a/release/preview/alpine314/docker/Dockerfile
+++ b/release/preview/alpine314/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.14.2 AS installer-env
+FROM alpine:3.14 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-preview.1
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14.2
+FROM alpine:3.14
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/preview/alpine314/test-deps/docker/Dockerfile b/release/preview/alpine314/test-deps/docker/Dockerfile
index 1c4f46570..7abedb0b2 100644
--- a/release/preview/alpine314/test-deps/docker/Dockerfile
+++ b/release/preview/alpine314/test-deps/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Docker image file that describes an Alpine image with PowerShell and test dependencies
 
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
 
 FROM node:14.17.6-alpine as node
 
diff --git a/release/preview/alpine314/test-deps/meta.json b/release/preview/alpine314/test-deps/meta.json
index e869ead84..dc64b7d78 100644
--- a/release/preview/alpine314/test-deps/meta.json
+++ b/release/preview/alpine314/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
+        "size": 335
     }
 }
diff --git a/release/stable/alpine311/docker/Dockerfile b/release/stable/alpine311/docker/Dockerfile
deleted file mode 100644
index 82cccd512..000000000
--- a/release/stable/alpine311/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.11 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.11
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine311/meta.json b/release/stable/alpine311/meta.json
deleted file mode 100644
index 4fafe0d29..000000000
--- a/release/stable/alpine311/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "#psversion#-alpine-3.11-#fulltag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.11"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/stable/alpine311/test-deps/docker/Dockerfile b/release/stable/alpine311/test-deps/docker/Dockerfile
deleted file mode 100644
index 835eef9a6..000000000
--- a/release/stable/alpine311/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine311/test-deps/meta.json b/release/stable/alpine311/test-deps/meta.json
deleted file mode 100644
index c2139fd9e..000000000
--- a/release/stable/alpine311/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.11$" : "alpine-3.11"
-    }
-}
diff --git a/release/stable/alpine312/docker/Dockerfile b/release/stable/alpine312/docker/Dockerfile
index 7b8e05a8c..a92803d2d 100644
--- a/release/stable/alpine312/docker/Dockerfile
+++ b/release/stable/alpine312/docker/Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.12.1
+FROM alpine:3.12
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/stable/alpine312/test-deps/meta.json b/release/stable/alpine312/test-deps/meta.json
index 49b703f2b..87cf6c059 100644
--- a/release/stable/alpine312/test-deps/meta.json
+++ b/release/stable/alpine312/test-deps/meta.json
@@ -4,16 +4,13 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.12",
     "tagTemplates": [
-        "#tag#"
+        "alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.12$" : "preview-alpine-3.12"
+        "size": 331
     }
 }
diff --git a/release/stable/alpine313/docker/Dockerfile b/release/stable/alpine313/docker/Dockerfile
index 727eb5ae5..c70f8e53b 100644
--- a/release/stable/alpine313/docker/Dockerfile
+++ b/release/stable/alpine313/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.13.6 AS installer-env
+FROM alpine:3.13 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.13.6
+FROM alpine:3.13
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/stable/alpine313/test-deps/docker/Dockerfile b/release/stable/alpine313/test-deps/docker/Dockerfile
index a95755d16..02d7b1b60 100644
--- a/release/stable/alpine313/test-deps/docker/Dockerfile
+++ b/release/stable/alpine313/test-deps/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Docker image file that describes an Alpine image with PowerShell and test dependencies
 
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
 
 FROM node:14.17.6-alpine as node
 
diff --git a/release/stable/alpine313/test-deps/meta.json b/release/stable/alpine313/test-deps/meta.json
index 99b7b5f23..00007c0fd 100644
--- a/release/stable/alpine313/test-deps/meta.json
+++ b/release/stable/alpine313/test-deps/meta.json
@@ -4,16 +4,13 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "#tag#"
+        "alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.13$" : "preview-alpine-3.13"
+        "size": 335
     }
 }
diff --git a/release/stable/alpine314/docker/Dockerfile b/release/stable/alpine314/docker/Dockerfile
index 1a7482805..e0a1d0596 100644
--- a/release/stable/alpine314/docker/Dockerfile
+++ b/release/stable/alpine314/docker/Dockerfile
@@ -3,7 +3,7 @@
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.14.2 AS installer-env
+FROM alpine:3.14 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0
@@ -24,7 +24,7 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14.2
+FROM alpine:3.14
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/stable/alpine314/test-deps/docker/Dockerfile b/release/stable/alpine314/test-deps/docker/Dockerfile
index 1c4f46570..7abedb0b2 100644
--- a/release/stable/alpine314/test-deps/docker/Dockerfile
+++ b/release/stable/alpine314/test-deps/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Docker image file that describes an Alpine image with PowerShell and test dependencies
 
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
 
 FROM node:14.17.6-alpine as node
 
diff --git a/release/stable/alpine314/test-deps/meta.json b/release/stable/alpine314/test-deps/meta.json
index 6e6446b4e..f71e6eac6 100644
--- a/release/stable/alpine314/test-deps/meta.json
+++ b/release/stable/alpine314/test-deps/meta.json
@@ -4,16 +4,13 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "#tag#"
+        "alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.14$" : "preview-alpine-3.14"
+        "size": 335
     }
 }

From 908e91e17d77937907b3ea6951fff2c477448aec Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 23 Nov 2021 15:52:01 -0800
Subject: [PATCH 165/354] Update Fedora 32 to Fedora 34 for preview (#604)

Update Fedora 32 to Fedora 34 for preview and stable
---
 .../preview/{fedora32 => fedora34}/docker/Dockerfile  |  9 ++++-----
 release/preview/{fedora32 => fedora34}/meta.json      |  8 ++++----
 .../test-deps/docker/Dockerfile                       |  4 ++--
 .../{fedora32 => fedora34}/test-deps/meta.json        |  2 +-
 .../stable/{fedora32 => fedora34}/docker/Dockerfile   | 11 +++++------
 release/stable/{fedora32 => fedora34}/meta.json       |  6 +++---
 .../test-deps/docker/Dockerfile                       |  4 ++--
 .../stable/{fedora32 => fedora34}/test-deps/meta.json |  2 +-
 8 files changed, 22 insertions(+), 24 deletions(-)
 rename release/preview/{fedora32 => fedora34}/docker/Dockerfile (91%)
 rename release/preview/{fedora32 => fedora34}/meta.json (72%)
 rename release/preview/{fedora32 => fedora34}/test-deps/docker/Dockerfile (77%)
 rename release/preview/{fedora32 => fedora34}/test-deps/meta.json (89%)
 rename release/stable/{fedora32 => fedora34}/docker/Dockerfile (88%)
 rename release/stable/{fedora32 => fedora34}/meta.json (77%)
 rename release/stable/{fedora32 => fedora34}/test-deps/docker/Dockerfile (78%)
 rename release/stable/{fedora32 => fedora34}/test-deps/meta.json (89%)

diff --git a/release/preview/fedora32/docker/Dockerfile b/release/preview/fedora34/docker/Dockerfile
similarity index 91%
rename from release/preview/fedora32/docker/Dockerfile
rename to release/preview/fedora34/docker/Dockerfile
index 3fd7ff31d..be563ee9e 100644
--- a/release/preview/fedora32/docker/Dockerfile
+++ b/release/preview/fedora34/docker/Dockerfile
@@ -1,10 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
+# Docker image file that describes Fedora 34 image with PowerShell installed from Microsoft YUM Repo
 ARG imageRepo=fedora
 
-FROM ${imageRepo}:32 AS installer-env
+FROM ${imageRepo}:34 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
@@ -14,7 +14,6 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
@@ -32,7 +31,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # Needed to run localdef
       glibc-locale-source \
     # Invoke-WebRequest doesn't work correctly without this
-      compat-openssl10 \
+      openssl-libs \
       ca-certificates \
       gssntlmssp \
     && echo "end - misc packages" \
@@ -45,7 +44,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && dnf updateinfo list -q --security \
     && echo "end - verifying all security advisories are installed..." \
     && dnf clean all \
-    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
diff --git a/release/preview/fedora32/meta.json b/release/preview/fedora34/meta.json
similarity index 72%
rename from release/preview/fedora32/meta.json
rename to release/preview/fedora34/meta.json
index 501bff419..f48f89000 100644
--- a/release/preview/fedora32/meta.json
+++ b/release/preview/fedora34/meta.json
@@ -2,15 +2,15 @@
     "IsLinux": true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "Fedora 32",
+    "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-32-#fulltag#",
-        "#psversion#-fedora-32",
+        "#psversion#-fedora-34-#fulltag#",
+        "#psversion#-fedora-34",
         "preview-fedora-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "32"}
+        {"Tag": "34"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/preview/fedora32/test-deps/docker/Dockerfile b/release/preview/fedora34/test-deps/docker/Dockerfile
similarity index 77%
rename from release/preview/fedora32/test-deps/docker/Dockerfile
rename to release/preview/fedora34/test-deps/docker/Dockerfile
index 16d8ef1cf..c0ff6363c 100644
--- a/release/preview/fedora32/test-deps/docker/Dockerfile
+++ b/release/preview/fedora34/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:preview-fedora-32
+ARG BaseImage=mcr.microsoft.com/powershell:preview-fedora-34
 
 FROM ${BaseImage}
 
@@ -14,7 +14,7 @@ RUN dnf install -y \
         findutils \
     && dnf clean all
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/preview/fedora32/test-deps/meta.json b/release/preview/fedora34/test-deps/meta.json
similarity index 89%
rename from release/preview/fedora32/test-deps/meta.json
rename to release/preview/fedora34/test-deps/meta.json
index ed19ce5c2..b21dea9f3 100644
--- a/release/preview/fedora32/test-deps/meta.json
+++ b/release/preview/fedora34/test-deps/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora 32",
+    "osVersion": "Fedora 34",
     "tagTemplates": [
         "preview-fedora-#shorttag#"
     ],
diff --git a/release/stable/fedora32/docker/Dockerfile b/release/stable/fedora34/docker/Dockerfile
similarity index 88%
rename from release/stable/fedora32/docker/Dockerfile
rename to release/stable/fedora34/docker/Dockerfile
index c1b14a603..9e9a08be3 100644
--- a/release/stable/fedora32/docker/Dockerfile
+++ b/release/stable/fedora34/docker/Dockerfile
@@ -1,10 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
+# Docker image file that describes Fedora 34 image with PowerShell installed from Microsoft YUM Repo
 ARG imageRepo=fedora
 
-FROM ${imageRepo}:32 AS installer-env
+FROM ${imageRepo}:34 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
@@ -14,11 +14,10 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-34
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
@@ -32,7 +31,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     # Needed to run localdef
       glibc-locale-source \
     # Invoke-WebRequest doesn't work correctly without this
-      compat-openssl10 \
+      openssl-libs \
       ca-certificates \
       gssntlmssp \
     && echo "end - misc packages" \
@@ -44,7 +43,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
     && dnf updateinfo list -q --security \
     && echo "end - verifying all security advisories are installed..." \
     && dnf clean all \
-    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # intialize powershell module cache
     && pwsh \
         -NoLogo \
diff --git a/release/stable/fedora32/meta.json b/release/stable/fedora34/meta.json
similarity index 77%
rename from release/stable/fedora32/meta.json
rename to release/stable/fedora34/meta.json
index ab62b52e8..59afcc30d 100644
--- a/release/stable/fedora32/meta.json
+++ b/release/stable/fedora34/meta.json
@@ -5,12 +5,12 @@
     "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-32-#fulltag#",
-        "#psversion#-fedora-32",
+        "#psversion#-fedora-34-#fulltag#",
+        "#psversion#-fedora-34",
         "fedora-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "32"}
+        {"Tag": "34"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/stable/fedora32/test-deps/docker/Dockerfile b/release/stable/fedora34/test-deps/docker/Dockerfile
similarity index 78%
rename from release/stable/fedora32/test-deps/docker/Dockerfile
rename to release/stable/fedora34/test-deps/docker/Dockerfile
index d360aad2a..1d3a28fc4 100644
--- a/release/stable/fedora32/test-deps/docker/Dockerfile
+++ b/release/stable/fedora34/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-32
+ARG BaseImage=mcr.microsoft.com/powershell:fedora-34
 
 FROM ${BaseImage}
 
@@ -14,7 +14,7 @@ RUN dnf install -y \
         findutils \
     && dnf clean all
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/stable/fedora32/test-deps/meta.json b/release/stable/fedora34/test-deps/meta.json
similarity index 89%
rename from release/stable/fedora32/test-deps/meta.json
rename to release/stable/fedora34/test-deps/meta.json
index 6aa438d25..86fed226d 100644
--- a/release/stable/fedora32/test-deps/meta.json
+++ b/release/stable/fedora34/test-deps/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora 32",
+    "osVersion": "Fedora 34",
     "tagTemplates": [
         "fedora-#shorttag#"
     ],

From c1c113e2304b9accf108691c16bbeddf431695cc Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 6 Dec 2021 15:57:29 -0800
Subject: [PATCH 166/354] sync readme from MCR (#598)

---
 docs/README.powershell.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/README.powershell.md b/docs/README.powershell.md
index 92012e1ef..7a8d2e092 100644
--- a/docs/README.powershell.md
+++ b/docs/README.powershell.md
@@ -54,6 +54,8 @@ For our support policy, see [PowerShell Core Support Lifecycle](https://docs.mic
   file an issue at [PowerShell/PowerShell-Docker](https://github.com/PowerShell/PowerShell-Docker/issues/new/choose)
 
 ## License
+- Legal Notice: [Container License Information](https://aka.ms/mcr/osslegalnotice)
+
 
 PowerShell is licensed under the [MIT license][].
 

From 7ff4b37d1c79f8c75ec379804dfe15e13bb676de Mon Sep 17 00:00:00 2001
From: danijeljw-rpc <danijel@repasscloud.com>
Date: Wed, 8 Dec 2021 03:35:05 +1100
Subject: [PATCH 167/354] minor edit - typo in comments (#606)

---
 release/stable/ubuntu20.04/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/stable/ubuntu20.04/docker/Dockerfile b/release/stable/ubuntu20.04/docker/Dockerfile
index 1a831b710..c1fe334a7 100644
--- a/release/stable/ubuntu20.04/docker/Dockerfile
+++ b/release/stable/ubuntu20.04/docker/Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
-    # requied to setup the locale
+    # required to setup the locale
         locales \
     # required for SSL
         ca-certificates \

From c04e1243f933ebf1a01f03a3eb3114d0a7d15b4f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:39:55 -0800
Subject: [PATCH 168/354] Update the release build yaml with the latest
 versions (#607)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 79519171a..2a246c0af 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.2.0-rc.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.0'
+    default: 'v7.2.1'
   - name: 'stableReleaseTag'
-    default: 'v7.2.0'
+    default: 'v7.2.1'
 
 resources:
 - repo: self

From a5054b04aaa81a84b9453cd0538e00b0843fac6e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Dec 2021 13:55:13 -0800
Subject: [PATCH 169/354] Add mariner 1.0 image (#608)

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md              |  5 --
 release/preview/mariner1/docker/Dockerfile    | 87 +++++++++++++++++++
 release/preview/mariner1/meta.json            | 16 ++++
 .../mariner1/test-deps/docker/Dockerfile      | 32 +++++++
 release/preview/mariner1/test-deps/meta.json  | 17 ++++
 tools/buildHelper/buildHelper.psm1            |  4 -
 6 files changed, 152 insertions(+), 9 deletions(-)
 create mode 100644 release/preview/mariner1/docker/Dockerfile
 create mode 100644 release/preview/mariner1/meta.json
 create mode 100644 release/preview/mariner1/test-deps/docker/Dockerfile
 create mode 100644 release/preview/mariner1/test-deps/meta.json

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7b98d0ff8..76de9fd4b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,8 +11,3 @@
 - [ ] [Make sure all `Dockerfile`, `.sh`, `.ps1` and `.psm1` files have the correct copyright header](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
 - [ ] This PR is ready to merge and is not [Work in Progress](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---work-in-progress).
   - If the PR is work in progress, please add the prefix `WIP:` to the beginning of the title and remove the prefix when the PR is ready.
-- **Adds a new image or tag**
-  - [ ] Not Applicable
-- **OR**
-  - [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/docs/README.powershellcommunity.md)
-  - [ ] Update [vsts-ci.yml](https://github.com/PowerShell/PowerShell-Docker/blob/master/vsts-ci.yml)
diff --git a/release/preview/mariner1/docker/Dockerfile b/release/preview/mariner1/docker/Dockerfile
new file mode 100644
index 000000000..9571b905c
--- /dev/null
+++ b/release/preview/mariner1/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM cblmariner.azurecr.io/base/core:1.0 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
+
+# Install dependencies and clean up
+RUN yum update -y \
+    # install dependencies
+    && yum install -y \
+    # required for localization
+    icu \
+    # required for help in PowerShell
+    less \
+    # required for SSH
+    openssh-clients \
+    ca-certificates \
+    # upgrade packages
+    && yum upgrade -y \
+    # clean cached data
+    && yum clean all \
+    # remove cache folders and files
+    && rm -rf /var/cache/yum
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/preview/mariner1/meta.json b/release/preview/mariner1/meta.json
new file mode 100644
index 000000000..9cbcc1333
--- /dev/null
+++ b/release/preview/mariner1/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "1.0"}
+    ],
+    "tagTemplates": [
+        "#psversion#-mariner-#tag#",
+        "preview-mariner"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 387
+    }
+}
diff --git a/release/preview/mariner1/test-deps/docker/Dockerfile b/release/preview/mariner1/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..fef76545d
--- /dev/null
+++ b/release/preview/mariner1/test-deps/docker/Dockerfile
@@ -0,0 +1,32 @@
+# Docker image file that describes an Mariner image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:mariner
+FROM ${BaseImage}
+
+# To find which package provides a particular command, run:
+# yum install dnf-utils
+# dnf provides <command>
+
+# Install dependencies and clean up
+RUN yum update -y \
+    # install dependencies
+    && yum install -y \
+    dnf-utils \
+    sudo \
+    curl \
+    wget \
+    # provides ping and trace path
+    iputils \
+    # provides ps
+    procps-ng \
+    # upgrade packages
+    && yum upgrade -y \
+    # clean cached data
+    && yum clean all \
+    # remove cache folders and files
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/mariner1/test-deps/meta.json b/release/preview/mariner1/test-deps/meta.json
new file mode 100644
index 000000000..1840e5156
--- /dev/null
+++ b/release/preview/mariner1/test-deps/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 1.0",
+    "tagTemplates": [
+        "preview-mariner-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-redhat"
+    ],
+    "TestProperties": {
+        "size": 422
+    }
+}
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index c3be4919c..9beeaad14 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -72,10 +72,6 @@ function Get-PowerShellVersion
         $retVersion = $Version
     }
 
-    if ($Linux.IsPresent) {
-        $retVersion = $retVersion -replace '\-', '~'
-    }
-
     return $retVersion
 }
 

From 41c59e4b844cec8678df8118e231f8cd6e4188bd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sat, 18 Dec 2021 11:41:31 -0800
Subject: [PATCH 170/354] Delete release/lts/debian9 directory. (#594)

Fixes:  https://github.com/PowerShell/PowerShell-Docker/issues/553
---
 release/lts/debian9/docker/Dockerfile         | 61 -------------------
 release/lts/debian9/meta.json                 | 19 ------
 .../lts/debian9/test-deps/docker/Dockerfile   | 22 -------
 release/lts/debian9/test-deps/meta.json       | 16 -----
 4 files changed, 118 deletions(-)
 delete mode 100644 release/lts/debian9/docker/Dockerfile
 delete mode 100644 release/lts/debian9/meta.json
 delete mode 100644 release/lts/debian9/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/debian9/test-deps/meta.json

diff --git a/release/lts/debian9/docker/Dockerfile b/release/lts/debian9/docker/Dockerfile
deleted file mode 100644
index b3fa55a9e..000000000
--- a/release/lts/debian9/docker/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:stretch-slim AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian9/meta.json b/release/lts/debian9/meta.json
deleted file mode 100644
index 8ef40ce93..000000000
--- a/release/lts/debian9/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Debian 9",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "lts-debian-#shorttag#-#fulltag#",
-        "lts-debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "stretch-slim"},
-        {"Tag": "9"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    }
-}
diff --git a/release/lts/debian9/test-deps/docker/Dockerfile b/release/lts/debian9/test-deps/docker/Dockerfile
deleted file mode 100644
index 0691eac7d..000000000
--- a/release/lts/debian9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian 9image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian9/test-deps/meta.json b/release/lts/debian9/test-deps/meta.json
deleted file mode 100644
index 3e5edb741..000000000
--- a/release/lts/debian9/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 9",
-    "tagTemplates": [
-        "lts-debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 316
-    }
-}

From 6c63cb30e8f6a0de612826798d2740724f38ec9e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 20 Dec 2021 11:31:08 -0800
Subject: [PATCH 171/354] Alpine 3.12 is not support for 7.2 (#610)

---
 release/stable/alpine312/docker/Dockerfile    | 87 -------------------
 release/stable/alpine312/meta.json            | 18 ----
 .../alpine312/test-deps/docker/Dockerfile     | 38 --------
 release/stable/alpine312/test-deps/meta.json  | 16 ----
 4 files changed, 159 deletions(-)
 delete mode 100644 release/stable/alpine312/docker/Dockerfile
 delete mode 100644 release/stable/alpine312/meta.json
 delete mode 100644 release/stable/alpine312/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/alpine312/test-deps/meta.json

diff --git a/release/stable/alpine312/docker/Dockerfile b/release/stable/alpine312/docker/Dockerfile
deleted file mode 100644
index a92803d2d..000000000
--- a/release/stable/alpine312/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.12 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.12
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine312/meta.json b/release/stable/alpine312/meta.json
deleted file mode 100644
index 6ed4aeb61..000000000
--- a/release/stable/alpine312/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.12"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/stable/alpine312/test-deps/docker/Dockerfile b/release/stable/alpine312/test-deps/docker/Dockerfile
deleted file mode 100644
index 3d65429f0..000000000
--- a/release/stable/alpine312/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/alpine312/test-deps/meta.json b/release/stable/alpine312/test-deps/meta.json
deleted file mode 100644
index 87cf6c059..000000000
--- a/release/stable/alpine312/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 331
-    }
-}

From f43f8775f0576c59d770bf5cd97bd93fe58180ee Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 20 Dec 2021 12:38:53 -0800
Subject: [PATCH 172/354] Fix duplicate check failure getting tag list (#611)

* Add diags for dup check failure

* Don't check servicing for duplicates

* fix centos 7 sizes

* update alpine 3.12 size

* update alpine 3.12 size
---
 release/preview/alpine312/meta.json           | 2 +-
 release/preview/alpine312/test-deps/meta.json | 2 +-
 release/preview/centos7/meta.json             | 2 +-
 release/preview/centos7/test-deps/meta.json   | 2 +-
 tools/buildHelper/buildHelper.psm1            | 2 +-
 vsts-ci.yml                                   | 8 +++++++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/release/preview/alpine312/meta.json b/release/preview/alpine312/meta.json
index dacef7d8b..7f98422ce 100644
--- a/release/preview/alpine312/meta.json
+++ b/release/preview/alpine312/meta.json
@@ -13,6 +13,6 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 230
     }
 }
diff --git a/release/preview/alpine312/test-deps/meta.json b/release/preview/alpine312/test-deps/meta.json
index 8ceaedf95..f5c0bf2a6 100644
--- a/release/preview/alpine312/test-deps/meta.json
+++ b/release/preview/alpine312/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-musl"
     ],
     "TestProperties": {
-        "size": 295
+        "size": 315
     }
 }
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
index 5394a93f3..cb644c99e 100644
--- a/release/preview/centos7/meta.json
+++ b/release/preview/centos7/meta.json
@@ -12,6 +12,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 550
+        "size": 586
     }
 }
diff --git a/release/preview/centos7/test-deps/meta.json b/release/preview/centos7/test-deps/meta.json
index 4d98eed2e..6b561df29 100644
--- a/release/preview/centos7/test-deps/meta.json
+++ b/release/preview/centos7/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 575
+        "size": 611
     }
 }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 9beeaad14..1cb787a2c 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -470,9 +470,9 @@ function Get-DockerImageMetaDataWrapper
     {
         if((Test-Path $scriptPath) )
         {
+            Write-Verbose "Getting tags using script: $scriptPath" -Verbose
             # Get the tag data for the image
             $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
-            Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
             if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
             {
                 throw "Did not get tag data from script for $scriptPath!"
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 94797f75f..f4194e15c 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -47,7 +47,13 @@ stages:
       - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
         displayName: Set Build Name for Non-PR
         condition: ne(variables['Build.Reason'], 'PullRequest')
-      - pwsh: ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, servicing, lts
+      - pwsh: |
+          try {
+            ./build.ps1 -CheckForDuplicateTags -Channel stable, preview, lts
+          } catch {
+            Get-Error
+            throw
+          }
         displayName: Check for Duplicate Tags
         condition: succeededOrFailed()
 

From 17af7f096c2a47f91295ab78629db75881892aae Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Dec 2021 13:34:51 -0800
Subject: [PATCH 173/354] Update the release build yaml with the latest
 versions (#609)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 2a246c0af..a4ec1810f 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.2.0-rc.1'
+    default: 'v7.3.0-preview.1'
   - name: 'ltsReleaseTag'
     default: 'v7.2.1'
   - name: 'stableReleaseTag'

From 6ef1991f8ab50fc31c53bea3bc333aa9a52e191b Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 31 Jan 2022 16:58:39 -0500
Subject: [PATCH 174/354] Remove centos 8 images as it is EOL (#613)

---
 release/7-1/centos8/docker/Dockerfile         | 56 ------------------
 release/7-1/centos8/meta.json                 | 17 ------
 .../7-1/centos8/test-deps/docker/Dockerfile   | 18 ------
 release/7-1/centos8/test-deps/meta.json       | 15 -----
 release/lts/centos8/dependabot/Dockerfile     |  6 --
 release/lts/centos8/docker/Dockerfile         | 55 ------------------
 release/lts/centos8/meta.json                 | 16 ------
 .../lts/centos8/test-deps/docker/Dockerfile   | 18 ------
 release/lts/centos8/test-deps/meta.json       | 15 -----
 release/preview/centos8/docker/Dockerfile     | 57 -------------------
 release/preview/centos8/meta.json             | 17 ------
 .../centos8/test-deps/docker/Dockerfile       | 18 ------
 release/preview/centos8/test-deps/meta.json   | 15 -----
 release/stable/centos8/docker/Dockerfile      | 56 ------------------
 release/stable/centos8/meta.json              | 17 ------
 .../centos8/test-deps/docker/Dockerfile       | 18 ------
 release/stable/centos8/test-deps/meta.json    | 15 -----
 17 files changed, 429 deletions(-)
 delete mode 100644 release/7-1/centos8/docker/Dockerfile
 delete mode 100644 release/7-1/centos8/meta.json
 delete mode 100644 release/7-1/centos8/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/centos8/test-deps/meta.json
 delete mode 100644 release/lts/centos8/dependabot/Dockerfile
 delete mode 100644 release/lts/centos8/docker/Dockerfile
 delete mode 100644 release/lts/centos8/meta.json
 delete mode 100644 release/lts/centos8/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/centos8/test-deps/meta.json
 delete mode 100644 release/preview/centos8/docker/Dockerfile
 delete mode 100644 release/preview/centos8/meta.json
 delete mode 100644 release/preview/centos8/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/centos8/test-deps/meta.json
 delete mode 100644 release/stable/centos8/docker/Dockerfile
 delete mode 100644 release/stable/centos8/meta.json
 delete mode 100644 release/stable/centos8/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/centos8/test-deps/meta.json

diff --git a/release/7-1/centos8/docker/Dockerfile b/release/7-1/centos8/docker/Dockerfile
deleted file mode 100644
index ce04aa199..000000000
--- a/release/7-1/centos8/docker/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:8 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/centos8/meta.json b/release/7-1/centos8/meta.json
deleted file mode 100644
index b83c1c7ec..000000000
--- a/release/7-1/centos8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
-        "centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 725
-    }
-}
diff --git a/release/7-1/centos8/test-deps/docker/Dockerfile b/release/7-1/centos8/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/7-1/centos8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/centos8/test-deps/meta.json b/release/7-1/centos8/test-deps/meta.json
deleted file mode 100644
index 55045a0b1..000000000
--- a/release/7-1/centos8/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    }
-}
diff --git a/release/lts/centos8/dependabot/Dockerfile b/release/lts/centos8/dependabot/Dockerfile
deleted file mode 100644
index 635aa6180..000000000
--- a/release/lts/centos8/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM centos:8
diff --git a/release/lts/centos8/docker/Dockerfile b/release/lts/centos8/docker/Dockerfile
deleted file mode 100644
index ddcfcd9ae..000000000
--- a/release/lts/centos8/docker/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:8 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/centos8/meta.json b/release/lts/centos8/meta.json
deleted file mode 100644
index 0e8fa2a94..000000000
--- a/release/lts/centos8/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "lts-centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 725
-    }
-}
diff --git a/release/lts/centos8/test-deps/docker/Dockerfile b/release/lts/centos8/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/lts/centos8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/centos8/test-deps/meta.json b/release/lts/centos8/test-deps/meta.json
deleted file mode 100644
index ca111f208..000000000
--- a/release/lts/centos8/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "lts-centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    }
-}
diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile
deleted file mode 100644
index bb6566e7d..000000000
--- a/release/preview/centos8/docker/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:8 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PACKAGE_VERSION=7.0.0_preview.1
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    # && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/preview/centos8/meta.json b/release/preview/centos8/meta.json
deleted file mode 100644
index 524654986..000000000
--- a/release/preview/centos8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
-        "preview-centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 723
-    }
-}
diff --git a/release/preview/centos8/test-deps/docker/Dockerfile b/release/preview/centos8/test-deps/docker/Dockerfile
deleted file mode 100644
index d44b77bb3..000000000
--- a/release/preview/centos8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-8
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-8
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/centos8/test-deps/meta.json b/release/preview/centos8/test-deps/meta.json
deleted file mode 100644
index 6ceee3efa..000000000
--- a/release/preview/centos8/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "preview-centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    }
-}
diff --git a/release/stable/centos8/docker/Dockerfile b/release/stable/centos8/docker/Dockerfile
deleted file mode 100644
index 0cfeec84a..000000000
--- a/release/stable/centos8/docker/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:8 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/centos8/meta.json b/release/stable/centos8/meta.json
deleted file mode 100644
index 8495ad2b0..000000000
--- a/release/stable/centos8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
-        "centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 725
-    }
-}
diff --git a/release/stable/centos8/test-deps/docker/Dockerfile b/release/stable/centos8/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/stable/centos8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/centos8/test-deps/meta.json b/release/stable/centos8/test-deps/meta.json
deleted file mode 100644
index 55045a0b1..000000000
--- a/release/stable/centos8/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 8",
-    "tagTemplates": [
-        "centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    }
-}

From 20472e25e00ba2cc10cc15daa64e89f4d3d5b2ea Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 3 Feb 2022 10:08:07 -0800
Subject: [PATCH 175/354] Switch to using standard images for release build
 (#615)

---
 .vsts-ci/releasePhase.yml                     |  7 ++--
 .vsts-ci/releaseStage.yml                     |  9 +++--
 .vsts-ci/releasebuild.yml                     | 33 ++++++++++++++-----
 .../templatesReleasePipeline/releaseJob.yml   |  7 ++--
 .../releaseManifestList.yml                   |  7 ++--
 .../templatesReleasePipeline/releaseStage.yml | 29 +++++++++-------
 .vsts-ci/templatesReleasePipeline/testJob.yml |  1 +
 .../templatesReleasePipeline/testStage.yml    |  1 +
 8 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index ccd4138d4..a8c149a0a 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -1,6 +1,6 @@
 parameters:
   - name: vmImage
-    default: 'ubuntu-latest'
+    default: PSMMSUbuntu20.04-Secure
   - name: jobName
     default: 'none'
   - name: releaseTag
@@ -27,7 +27,10 @@ jobs:
     releaseTag: ${{ parameters.releaseTag }}
 
   pool:
-    vmImage: ${{ parameters.vmImage }}
+    name: PowerShell1ES
+    demands:
+      - ImageOverride -equals ${{ parameters.vmImage }}
+
   timeoutInMinutes: 135
 
   displayName: ${{ parameters.jobName }}
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 2887062d8..740dc9773 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -2,7 +2,7 @@ parameters:
   - name: channel
     default: 'preview'
   - name: vmImage
-    default: 'ubuntu-latest'
+    default: PSMMSUbuntu20.04-Secure
   - name: acr
     default: 'All'
   - name: useacr
@@ -17,7 +17,10 @@ stages:
     jobs:
     - job: GenerateYaml_${{ parameters.channel }}
       pool:
-        vmImage: ubuntu-latest
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals ${{ parameters.vmImage }}
+
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
@@ -41,5 +44,5 @@ stages:
         dependsOn:
           - GenerateYaml_${{ parameters.channel }}
         jobName: Build_Win
-        vmImage: windows-2019
+        vmImage: PSMMS2019-Secure
         ACR: yes
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index a4ec1810f..54778bf39 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -30,7 +30,9 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        vmImage: ubuntu-latest
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals PSMMSUbuntu20.04-Secure
         timeoutInMinutes: 30
 
       steps:
@@ -79,9 +81,13 @@ stages:
 
       displayName: Create Preview Manifest Lists
       condition: succeededOrFailed()
+
       pool:
-        vmImage: windows-latest
-        timeoutInMinutes: 30
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals PSMMS2019-Secure
+
+      timeoutInMinutes: 30
 
       steps:
       - template: manifestSteps.yml
@@ -94,8 +100,11 @@ stages:
       displayName: Create Lts Manifest Lists
       condition: succeededOrFailed()
       pool:
-        vmImage: windows-latest
-        timeoutInMinutes: 30
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals PSMMS2019-Secure
+
+      timeoutInMinutes: 30
 
       steps:
       - template: manifestSteps.yml
@@ -109,8 +118,11 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        vmImage: windows-latest
-        timeoutInMinutes: 30
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals PSMMS2019-Secure
+
+      timeoutInMinutes: 30
 
       steps:
       - template: manifestSteps.yml
@@ -124,8 +136,11 @@ stages:
 
       condition: succeededOrFailed()
       pool:
-        vmImage: ubuntu-latest
-        timeoutInMinutes: 30
+        name: PowerShell1ES
+        demands:
+          - ImageOverride -equals PSMMSUbuntu20.04-Secure
+
+      timeoutInMinutes: 30
 
       steps:
       - task: DownloadBuildArtifacts@0
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
index 470489c06..c169e70a8 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -1,6 +1,6 @@
 parameters:
   - name: vmImage
-    default: 'ubuntu-latest'
+    default: PSMMSUbuntu20.04-Secure
   - name: jobName
     default: 'none'
   - name: releaseTag
@@ -36,7 +36,10 @@ jobs:
         value: ${{ parameters.WhatIf }}
 
     pool:
-      vmImage: ${{ parameters.vmImage }}
+      name: PowerShell1ES
+      demands:
+        - ImageOverride -equals ${{ parameters.vmImage }}
+
     timeoutInMinutes: 30
 
     displayName: ${{ parameters.jobName }}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
index 5344e7ecd..9cb10a13e 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseManifestList.yml
@@ -1,6 +1,6 @@
 parameters:
   - name: vmImage
-    default: 'windows-latest'
+    default: 'PSMMS2019-Secure'
   - name: jobName
     default: 'none'
   - name: releaseTag
@@ -35,7 +35,10 @@ jobs:
         value: ${{ parameters.WhatIf }}
 
     pool:
-      vmImage: ${{ parameters.vmImage }}
+      name: PowerShell1ES
+      demands:
+        - ImageOverride -equals ${{ parameters.vmImage }}
+
     timeoutInMinutes: 30
 
     displayName: ${{ parameters.jobName }}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index 357a5828d..9b1fb46d3 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -2,7 +2,7 @@ parameters:
     - name: "channel"
       default: 'preview'
     - name: "vmImage"
-      default: 'ubuntu-latest'
+      default: PSMMSUbuntu20.04-Secure
     - name: "acr"
       default: 'All'
     - name: "useacr"
@@ -21,24 +21,30 @@ stages:
       jobs:
       - job: GenerateYaml_${{ parameters.channel }}
         pool:
-            vmImage: ubuntu-latest
+          name: PowerShell1ES
+          demands:
+            - ImageOverride -equals ${{ parameters.vmImage }}
+
         displayName: Generate Matrix YAML ${{ parameters.channel }}
         steps:
-        - pwsh: |
-            ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
-          displayName: Generate Matrix YAML
-          condition: succeededOrFailed()
-          name: matrix
-        - pwsh: |
-            dir env:matrix_* | out-string -Width 1000
-          displayName: Capture Matrix YAML
-          condition: succeededOrFailed()
+
+          - pwsh: |
+              ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+            displayName: Generate Matrix YAML
+            condition: succeededOrFailed()
+            name: matrix
+
+          - pwsh: |
+              dir env:matrix_* | out-string -Width 1000
+            displayName: Capture Matrix YAML
+            condition: succeededOrFailed()
 
       - template: ./releaseJob.yml
         parameters:
           jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
           WhatIf: ${{ parameters.WhatIf }}
+          vmImage: "PSMMS2019-Secure"
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
@@ -47,6 +53,7 @@ stages:
           jobName: ${{ parameters.channel }}_linux
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
           WhatIf: ${{ parameters.WhatIf }}
+          vmImage: "PSMMSUbuntu20.04-Secure"
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
diff --git a/.vsts-ci/templatesReleasePipeline/testJob.yml b/.vsts-ci/templatesReleasePipeline/testJob.yml
index 3ff1d522e..38f1417db 100644
--- a/.vsts-ci/templatesReleasePipeline/testJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/testJob.yml
@@ -27,6 +27,7 @@ jobs:
 
     pool:
       vmImage: ${{ parameters.vmImage }}
+
     timeoutInMinutes: 30
 
     displayName: ${{ parameters.jobName }}
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index eab8ffa01..d5fff6af2 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -21,6 +21,7 @@ stages:
       - job: GenerateYaml_${{ parameters.channel }}
         pool:
           vmImage: ubuntu-latest
+
         displayName: Generate Matrix YAML ${{ parameters.channel }}
         steps:
         - pwsh: |

From 8fcdf7843ebef089d35430f18d650bb295073f96 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 18 Feb 2022 13:10:50 -0800
Subject: [PATCH 176/354] Fix mariner tag generation (#616)

---
 release/preview/mariner1/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/mariner1/meta.json b/release/preview/mariner1/meta.json
index 9cbcc1333..6db639378 100644
--- a/release/preview/mariner1/meta.json
+++ b/release/preview/mariner1/meta.json
@@ -7,7 +7,7 @@
     ],
     "tagTemplates": [
         "#psversion#-mariner-#tag#",
-        "preview-mariner"
+        "preview-mariner-#shorttag#"
     ],
     "SubImage": "test-deps",
     "TestProperties": {

From 57498aa3378c1d6801849abf32ad6df9378a57b5 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 24 Mar 2022 11:53:55 -0700
Subject: [PATCH 177/354] Add osVersion to mariner (#621)

---
 build.ps1                                                | 2 +-
 release/community-stable/amazonlinux/meta.json           | 3 ++-
 release/community-stable/amazonlinux/test-deps/meta.json | 3 ++-
 release/preview/mariner1/docker/Dockerfile               | 8 ++++----
 release/preview/mariner1/meta.json                       | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.ps1 b/build.ps1
index bf5048f1a..e421d0407 100755
--- a/build.ps1
+++ b/build.ps1
@@ -418,7 +418,7 @@ End {
                         $osVersion = $osVersion.replace('${fromTag}', $actualTagData.fromTag)
                     }
                     else {
-                        $osVersion = ''
+                        throw "meta.json should have osVersion: $dockerFileName"
                     }
 
                     # skip if we are generate TagsYaml and the image is private.
diff --git a/release/community-stable/amazonlinux/meta.json b/release/community-stable/amazonlinux/meta.json
index db14b863d..717e31455 100644
--- a/release/community-stable/amazonlinux/meta.json
+++ b/release/community-stable/amazonlinux/meta.json
@@ -9,5 +9,6 @@
         "#psversion#-amazonlinux-#tag#",
         "amazonlinux"
     ],
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "osVersion": "Amazon Linux"
 }
diff --git a/release/community-stable/amazonlinux/test-deps/meta.json b/release/community-stable/amazonlinux/test-deps/meta.json
index 76b51f945..62b4e16c3 100644
--- a/release/community-stable/amazonlinux/test-deps/meta.json
+++ b/release/community-stable/amazonlinux/test-deps/meta.json
@@ -7,5 +7,6 @@
     "FullRepository": "pshorg/powershellcommunity-test-deps",
     "OptionalTests": [
         "test-deps"
-    ]
+    ],
+    "osVersion": "Amazon Linux"
 }
diff --git a/release/preview/mariner1/docker/Dockerfile b/release/preview/mariner1/docker/Dockerfile
index 9571b905c..b53b98043 100644
--- a/release/preview/mariner1/docker/Dockerfile
+++ b/release/preview/mariner1/docker/Dockerfile
@@ -45,9 +45,9 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
 
 # Install dependencies and clean up
-RUN yum update -y \
+RUN tdnf update -y \
     # install dependencies
-    && yum install -y \
+    && tdnf install -y \
     # required for localization
     icu \
     # required for help in PowerShell
@@ -56,9 +56,9 @@ RUN yum update -y \
     openssh-clients \
     ca-certificates \
     # upgrade packages
-    && yum upgrade -y \
+    && tdnf upgrade -y \
     # clean cached data
-    && yum clean all \
+    && tdnf clean all \
     # remove cache folders and files
     && rm -rf /var/cache/yum
 
diff --git a/release/preview/mariner1/meta.json b/release/preview/mariner1/meta.json
index 6db639378..5cf0d7ca2 100644
--- a/release/preview/mariner1/meta.json
+++ b/release/preview/mariner1/meta.json
@@ -2,6 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 1.0",
     "shortTags": [
         {"Tag": "1.0"}
     ],

From 46ad2b347ba9340e13ec0c5c417d8504f43e52cb Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 24 Mar 2022 12:31:56 -0700
Subject: [PATCH 178/354] Pull mariner from MCR (#622)

---
 release/preview/mariner1/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/preview/mariner1/docker/Dockerfile b/release/preview/mariner1/docker/Dockerfile
index b53b98043..1fb7a02fd 100644
--- a/release/preview/mariner1/docker/Dockerfile
+++ b/release/preview/mariner1/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM cblmariner.azurecr.io/base/core:1.0 AS installer-env
+FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.1

From 8b5a3fffcc4078feee74ff1660967d652f3ccfc0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 24 Mar 2022 16:19:26 -0700
Subject: [PATCH 179/354] Update the release build yaml with the latest
 versions (#617)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 54778bf39..fced19fd7 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.1'
+    default: 'v7.3.0-preview.3'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.1'
+    default: 'v7.2.2'
   - name: 'stableReleaseTag'
-    default: 'v7.2.1'
+    default: 'v7.2.2'
 
 resources:
 - repo: self

From a9f97ef5f8dfde10dec2f91bab2c67014fef732f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 Apr 2022 11:46:09 -0700
Subject: [PATCH 180/354] Simplify image tagging (#618)

---
 build.ps1                                     |   1 +
 docs/development.md                           |  44 ++++---
 release/7-1/alpine311/meta.json               |   2 +-
 release/7-1/alpine312/meta.json               |   2 +-
 release/7-1/alpine313/meta.json               |   2 +-
 release/7-1/alpine314/meta.json               |   2 +-
 release/7-1/arm32v7/meta.json                 |   6 +-
 release/7-1/centos7/meta.json                 |   2 +-
 release/7-1/debian10/meta.json                |   1 -
 release/7-1/debian11/meta.json                |   1 -
 release/7-1/debian9/meta.json                 |   1 -
 release/7-1/fedora32/meta.json                |   1 -
 release/7-1/nanoserver1809/meta.json          |   1 -
 release/7-1/nanoserver1909/meta.json          |   1 -
 release/7-1/nanoserver2004/meta.json          |   1 -
 release/7-1/nanoserver2022/meta.json          |   1 -
 release/7-1/nanoserver20H2/meta.json          |   1 -
 release/7-1/ubuntu16.04/meta.json             |   2 +-
 release/7-1/ubuntu18.04/meta.json             |   1 -
 release/7-1/ubuntu20.04/meta.json             |   1 -
 release/7-1/windowsserver2022/meta.json       |   1 -
 release/7-1/windowsservercore1909/meta.json   |   1 -
 release/7-1/windowsservercore2004/meta.json   |   1 -
 release/7-1/windowsservercore2022/meta.json   |   1 -
 release/7-1/windowsservercore20H2/meta.json   |   1 -
 release/lts/debian10/meta.json                |   1 -
 release/lts/debian11/meta.json                |   1 -
 release/lts/nanoserver1809/meta.json          |   6 +-
 release/lts/nanoserver1909/meta.json          |   3 +-
 release/lts/nanoserver2004/meta.json          |   1 -
 release/lts/nanoserver2022/meta.json          |   4 +-
 release/lts/nanoserver20H2/meta.json          |   3 +-
 release/lts/windowsserver2022/meta.json       |   4 +-
 release/lts/windowsservercore1909/meta.json   |   3 +-
 release/lts/windowsservercore2004/meta.json   |   3 +-
 release/lts/windowsservercore2022/meta.json   |   4 +-
 release/lts/windowsservercore20H2/meta.json   |   3 +-
 release/preview/alpine312/meta.json           |   1 -
 release/preview/alpine313/meta.json           |   1 -
 release/preview/alpine314/meta.json           |   1 -
 release/preview/arm32v7/meta.json             |   4 +-
 release/preview/centos7/meta.json             |   1 -
 release/preview/debian10/meta.json            |   2 -
 release/preview/debian11/meta.json            |   2 -
 release/preview/debian9/meta.json             |   2 -
 release/preview/fedora34/meta.json            |   2 -
 release/preview/mariner1/meta.json            |   1 -
 release/preview/nanoserver1809/meta.json      |   5 +-
 release/preview/nanoserver1909/meta.json      |   2 -
 release/preview/nanoserver2004/meta.json      |   2 -
 release/preview/nanoserver2022/meta.json      |   2 -
 release/preview/nanoserver20H2/meta.json      |   2 -
 release/preview/ubuntu16.04/meta.json         |   1 -
 release/preview/ubuntu18.04/meta.json         |   2 -
 release/preview/ubuntu20.04/meta.json         |   2 -
 release/preview/windowsserver2022/meta.json   |   2 -
 .../preview/windowsservercore1909/meta.json   |   2 -
 .../preview/windowsservercore2004/meta.json   |   2 -
 .../preview/windowsservercore2022/meta.json   |   2 -
 .../preview/windowsservercore20H2/meta.json   |   2 -
 release/servicing/centos7/getLatestTag.ps1    |  14 ---
 release/servicing/debian9/getLatestTag.ps1    |  14 ---
 .../servicing/nanoserver1809/getLatestTag.ps1 |  21 ----
 .../servicing/opensuse423/getLatestTag.ps1    |  14 ---
 .../servicing/ubuntu16.04/getLatestTag.ps1    |  14 ---
 .../servicing/ubuntu18.04/getLatestTag.ps1    |  14 ---
 .../windowsservercore/getLatestTag.ps1        |  19 ---
 release/stable/alpine313/meta.json            |   2 +-
 release/stable/alpine314/meta.json            |   2 +-
 release/stable/arm32v7/meta.json              |   6 +-
 release/stable/centos7/meta.json              |   2 +-
 release/stable/debian10/meta.json             |   1 -
 release/stable/debian11/meta.json             |   1 -
 release/stable/debian9/meta.json              |   1 -
 release/stable/fedora34/meta.json             |   1 -
 release/stable/nanoserver1809/meta.json       |   4 +-
 release/stable/nanoserver1909/meta.json       |   1 -
 release/stable/nanoserver2004/meta.json       |   1 -
 release/stable/nanoserver2022/meta.json       |   1 -
 release/stable/nanoserver20H2/meta.json       |   1 -
 release/stable/ubuntu16.04/meta.json          |   2 +-
 release/stable/ubuntu18.04/meta.json          |   1 -
 release/stable/ubuntu20.04/meta.json          |   1 -
 release/stable/windowsserver2022/meta.json    |   1 -
 .../stable/windowsservercore1909/meta.json    |   1 -
 .../stable/windowsservercore2004/meta.json    |   1 -
 .../stable/windowsservercore2022/meta.json    |   1 -
 .../stable/windowsservercore20H2/meta.json    |   1 -
 tests/containerTestCommon.psm1                |   1 +
 tools/buildHelper/buildHelper.psm1            |  47 +++----
 tools/getDockerTags/getDockerTags.psm1        | 119 +-----------------
 91 files changed, 71 insertions(+), 399 deletions(-)
 delete mode 100644 release/servicing/centos7/getLatestTag.ps1
 delete mode 100644 release/servicing/debian9/getLatestTag.ps1
 delete mode 100644 release/servicing/nanoserver1809/getLatestTag.ps1
 delete mode 100644 release/servicing/opensuse423/getLatestTag.ps1
 delete mode 100644 release/servicing/ubuntu16.04/getLatestTag.ps1
 delete mode 100644 release/servicing/ubuntu18.04/getLatestTag.ps1
 delete mode 100644 release/servicing/windowsservercore/getLatestTag.ps1

diff --git a/build.ps1 b/build.ps1
index e421d0407..fe362ccea 100755
--- a/build.ps1
+++ b/build.ps1
@@ -219,6 +219,7 @@ DynamicParam {
 }
 
 Begin {
+    $ENV:DOCKER_BUILDKIT=1
     if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
diff --git a/docs/development.md b/docs/development.md
index f7c19d59a..c4492e252 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -50,45 +50,44 @@ The top level folder with the `Dockerfile`s is `release`.
 This should only have folders under it.
 The three folders are:
 
-* `stable` - Images for the current stable release of PowerShell Core.
-* `preview` - Images for the current preview release of PowerShell Core.
-* `community-stable` - Images for the current release of PowerShell Core that are not officially supported.
+- `stable` - Images for the current stable release of PowerShell Core.
+- `preview` - Images for the current preview release of PowerShell Core.
+- `community-stable` - Images for the current release of PowerShell Core that are not officially supported.
 
 Under each of these, will be a folder for each image.
 The name of the folder will be the name of the image in the build system, but does not translate into anything in docker.
 For example, the `stable` Ubuntu 16.04 image is in `release/stable/ubuntu16.04`.
 In this folder, there are 4 items:
 
-* `docker` - A folder containing the `Dockerfile` to build the image and any other files needed in the Docker build context.
-* `test-deps` (official images only) - Directory for a sub-image. See the [`test-deps` image purpose](./index.md#test-dep-images).
-* `dependabot` (optional) - in this directory you can put a dummy `Dockerfile` for [Dependabot](https://dependabot.com) to auto-bump the version. See [Dependabot](#dependabot).
-* `meta.json` - See [this section](#metadata-files) later.
-* `getLatestTag.ps1` - This script should use the `Get-DockerTags` command from `tools\getDockerTags` to get the tags that should be used as the tag in the `FROM` statement in the Dockerfile.
+- `docker` - A folder containing the `Dockerfile` to build the image and any other files needed in the Docker build context.
+- `test-deps` (official images only) - Directory for a sub-image. See the [`test-deps` image purpose](./index.md#test-dep-images).
+- `dependabot` (optional) - in this directory you can put a dummy `Dockerfile` for [Dependabot](https://dependabot.com) to auto-bump the version. See [Dependabot](#dependabot).
+- `meta.json` - See [this section](#metadata-files) later.
 
 ### `Dockerfile` Standards
 
 All `Dockerfile`s should follow certain standards:
 
-* The following comments should be applied at the beginning of the `Dockerfile`:
+- The following comments should be applied at the beginning of the `Dockerfile`:
 
-  * Copyright notice
-  * Software license
-  * A brief description should be applied after a new line.
+  - Copyright notice
+  - Software license
+  - A brief description should be applied after a new line.
 
    For example:
 
 ```dockerfile
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes a brief description of the image to describe
 # this image
 ```
 
-* All arguments should be defaulted if needed to successfully build without specifying the argument
+- All arguments should be defaulted if needed to successfully build without specifying the argument
+
+- The `FROM` statement should use an argument.
 
-* The `FROM` statement should use an argument.
-  
   For example:
 
 ```dockerfile
@@ -97,15 +96,15 @@ ARG fromTag=16.04
 FROM ubuntu:${fromTag}
 ```
 
-* A `PS_VERSION` argument should be defined, and used wherever the version is needed.
-  
+- A `PS_VERSION` argument should be defined, and used wherever the version is needed.
+
   For example:
 
 ```dockerfile
 ARG PS_VERSION=6.0.4
 ```
 
-* An `IMAGE_NAME` argument should be defined, and used in the labels where the image name is needed.
+- An `IMAGE_NAME` argument should be defined, and used in the labels where the image name is needed.
 
   For example:
 
@@ -132,11 +131,10 @@ Tags are a JSON array that describes the tags the image should have.
 
 Tags you can use:
 
-  * `#psversion#` is replaced by the version of PowerShell used to build the image.
-  * `#tag#` is replaced by all tags generated by the `getLatestTag.ps1` script.
-  * `#shorttag#` is replaced by short tags generated by the `getLatestTag.ps1` script.
+- `#psversion#` is replaced by the `<Major>.<Minor>` form of the version of PowerShell used to build the image.
+- `#shorttag#` is replaced by short tags generated from meta.json.
 
-### Example
+### Example Tag Template
 
 ```json
 "tagTemplates": [
diff --git a/release/7-1/alpine311/meta.json b/release/7-1/alpine311/meta.json
index 4fafe0d29..db4e8ee5b 100644
--- a/release/7-1/alpine311/meta.json
+++ b/release/7-1/alpine311/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.11",
     "tagTemplates": [
-        "#psversion#-alpine-3.11-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/alpine312/meta.json b/release/7-1/alpine312/meta.json
index 6ed4aeb61..4db5c23c2 100644
--- a/release/7-1/alpine312/meta.json
+++ b/release/7-1/alpine312/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.12",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/alpine313/meta.json b/release/7-1/alpine313/meta.json
index 6f3aeb169..8660e7601 100644
--- a/release/7-1/alpine313/meta.json
+++ b/release/7-1/alpine313/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/alpine314/meta.json b/release/7-1/alpine314/meta.json
index b50c60bb8..a7306fc67 100644
--- a/release/7-1/alpine314/meta.json
+++ b/release/7-1/alpine314/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/arm32v7/meta.json b/release/7-1/arm32v7/meta.json
index 6cf0b1d21..9b772c8a1 100644
--- a/release/7-1/arm32v7/meta.json
+++ b/release/7-1/arm32v7/meta.json
@@ -7,12 +7,12 @@
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-bionic-#fulltag#",
-        "#psversion#-arm32v7-ubuntu-18.04-#fulltag#",
+        "#psversion#-arm32v7-ubuntu-#shorttag#",
         "arm32v7-ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bionic"}
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
     ],
     "TestProperties": {
         "size": 550,
diff --git a/release/7-1/centos7/meta.json b/release/7-1/centos7/meta.json
index 4dac265f2..2b9ccbaf3 100644
--- a/release/7-1/centos7/meta.json
+++ b/release/7-1/centos7/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
+        "#psversion#-centos-#shorttag#",
         "centos-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/debian10/meta.json b/release/7-1/debian10/meta.json
index 7d70a28d4..aef74175d 100644
--- a/release/7-1/debian10/meta.json
+++ b/release/7-1/debian10/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/7-1/debian11/meta.json b/release/7-1/debian11/meta.json
index ab829767e..162371132 100644
--- a/release/7-1/debian11/meta.json
+++ b/release/7-1/debian11/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/7-1/debian9/meta.json b/release/7-1/debian9/meta.json
index aa3aa389e..2909eafdb 100644
--- a/release/7-1/debian9/meta.json
+++ b/release/7-1/debian9/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/7-1/fedora32/meta.json b/release/7-1/fedora32/meta.json
index 5e93a9423..246c00f21 100644
--- a/release/7-1/fedora32/meta.json
+++ b/release/7-1/fedora32/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-32-#fulltag#",
         "#psversion#-fedora-32",
         "fedora-32-#shorttag#"
     ],
diff --git a/release/7-1/nanoserver1809/meta.json b/release/7-1/nanoserver1809/meta.json
index e6bd7be2b..f9dee969d 100644
--- a/release/7-1/nanoserver1809/meta.json
+++ b/release/7-1/nanoserver1809/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1809-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/nanoserver1909/meta.json b/release/7-1/nanoserver1909/meta.json
index 64a57cf93..701d33bfd 100644
--- a/release/7-1/nanoserver1909/meta.json
+++ b/release/7-1/nanoserver1909/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1909-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/nanoserver2004/meta.json b/release/7-1/nanoserver2004/meta.json
index 4e891438e..d10b78351 100644
--- a/release/7-1/nanoserver2004/meta.json
+++ b/release/7-1/nanoserver2004/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-2004-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/nanoserver2022/meta.json b/release/7-1/nanoserver2022/meta.json
index 7dd344aaa..af1db936a 100644
--- a/release/7-1/nanoserver2022/meta.json
+++ b/release/7-1/nanoserver2022/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-#shorttag#-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/nanoserver20H2/meta.json b/release/7-1/nanoserver20H2/meta.json
index 8b66993ba..02c16fb9d 100644
--- a/release/7-1/nanoserver20H2/meta.json
+++ b/release/7-1/nanoserver20H2/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-20H2-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/7-1/ubuntu16.04/meta.json b/release/7-1/ubuntu16.04/meta.json
index 26182f14c..0e87f672b 100644
--- a/release/7-1/ubuntu16.04/meta.json
+++ b/release/7-1/ubuntu16.04/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/7-1/ubuntu18.04/meta.json b/release/7-1/ubuntu18.04/meta.json
index 2286d5636..b57c000de 100644
--- a/release/7-1/ubuntu18.04/meta.json
+++ b/release/7-1/ubuntu18.04/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
         "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
diff --git a/release/7-1/ubuntu20.04/meta.json b/release/7-1/ubuntu20.04/meta.json
index f3d26f4bb..fe47f3de2 100644
--- a/release/7-1/ubuntu20.04/meta.json
+++ b/release/7-1/ubuntu20.04/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Ubuntu 20.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
         "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
diff --git a/release/7-1/windowsserver2022/meta.json b/release/7-1/windowsserver2022/meta.json
index da3e35cb8..b5738ca10 100644
--- a/release/7-1/windowsserver2022/meta.json
+++ b/release/7-1/windowsserver2022/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsserver-#shorttag#",
-        "#psversion#-windowsserver-#shorttag#-#fulltag#",
         "windowsserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/windowsservercore1909/meta.json b/release/7-1/windowsservercore1909/meta.json
index fab03b5e4..3637edbd2 100644
--- a/release/7-1/windowsservercore1909/meta.json
+++ b/release/7-1/windowsservercore1909/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1909-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/windowsservercore2004/meta.json b/release/7-1/windowsservercore2004/meta.json
index 3df98f9c3..504d74601 100644
--- a/release/7-1/windowsservercore2004/meta.json
+++ b/release/7-1/windowsservercore2004/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-2004-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/windowsservercore2022/meta.json b/release/7-1/windowsservercore2022/meta.json
index 1cc0b0a7f..71998ce09 100644
--- a/release/7-1/windowsservercore2022/meta.json
+++ b/release/7-1/windowsservercore2022/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/7-1/windowsservercore20H2/meta.json b/release/7-1/windowsservercore20H2/meta.json
index 12a69024a..b78fbb521 100644
--- a/release/7-1/windowsservercore20H2/meta.json
+++ b/release/7-1/windowsservercore20H2/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-20H2-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/lts/debian10/meta.json b/release/lts/debian10/meta.json
index da101b4c2..c49872a0c 100644
--- a/release/lts/debian10/meta.json
+++ b/release/lts/debian10/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "lts-debian-#shorttag#-#fulltag#",
         "lts-debian-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
index d149a05fd..161bed3ea 100644
--- a/release/lts/debian11/meta.json
+++ b/release/lts/debian11/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "lts-debian-#shorttag#-#fulltag#",
         "lts-debian-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
index c15ddca9d..f051b1a4c 100644
--- a/release/lts/nanoserver1809/meta.json
+++ b/release/lts/nanoserver1809/meta.json
@@ -8,8 +8,7 @@
         }
     ],
     "tagTemplates": [
-        "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-1809-#fulltag#"
+        "lts-nanoserver-#shorttag#"
     ],
     "manifestLists": [
         "nanoserver-lts"
@@ -17,5 +16,6 @@
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
-    }
+    },
+    "UseAcr": true
 }
diff --git a/release/lts/nanoserver1909/meta.json b/release/lts/nanoserver1909/meta.json
index 685e8675f..96f86a0fc 100644
--- a/release/lts/nanoserver1909/meta.json
+++ b/release/lts/nanoserver1909/meta.json
@@ -8,8 +8,7 @@
         }
     ],
     "tagTemplates": [
-        "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-1909-#fulltag#"
+        "lts-nanoserver-#shorttag#"
     ],
     "manifestLists": [
         "nanoserver-lts"
diff --git a/release/lts/nanoserver2004/meta.json b/release/lts/nanoserver2004/meta.json
index 395fcd0af..e5eee0bbb 100644
--- a/release/lts/nanoserver2004/meta.json
+++ b/release/lts/nanoserver2004/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-2004-#fulltag#"
     ],
     "manifestLists": [
         "nanoserver-lts"
diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json
index 9bdafd6be..09d851a21 100644
--- a/release/lts/nanoserver2022/meta.json
+++ b/release/lts/nanoserver2022/meta.json
@@ -8,9 +8,7 @@
         }
     ],
     "tagTemplates": [
-        "lts-#psversion#-nanoserver-#shorttag#",
-        "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-#shorttag#-#fulltag#"
+        "lts-nanoserver-#shorttag#"
     ],
     "manifestLists": [
         "nanoserver-lts"
diff --git a/release/lts/nanoserver20H2/meta.json b/release/lts/nanoserver20H2/meta.json
index 7d69f2d91..312314cb8 100644
--- a/release/lts/nanoserver20H2/meta.json
+++ b/release/lts/nanoserver20H2/meta.json
@@ -8,8 +8,7 @@
         }
     ],
     "tagTemplates": [
-        "lts-nanoserver-#shorttag#",
-        "lts-nanoserver-20H2-#fulltag#"
+        "lts-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/lts/windowsserver2022/meta.json b/release/lts/windowsserver2022/meta.json
index d9f4c7ef3..43f00a549 100644
--- a/release/lts/windowsserver2022/meta.json
+++ b/release/lts/windowsserver2022/meta.json
@@ -9,9 +9,7 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "lts-#psversion#-windowsserver-#shorttag#",
-        "lts-windowsserver-#shorttag#",
-        "lts-windowsserver-#shorttag#-#fulltag#"
+        "lts-windowsserver-#shorttag#"
     ],
     "manifestLists": [
         "lts"
diff --git a/release/lts/windowsservercore1909/meta.json b/release/lts/windowsservercore1909/meta.json
index 0f0ede9ff..05812a50c 100644
--- a/release/lts/windowsservercore1909/meta.json
+++ b/release/lts/windowsservercore1909/meta.json
@@ -9,8 +9,7 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-1909-#fulltag#"
+        "lts-windowsservercore-#shorttag#"
     ],
     "manifestLists": [
         "lts"
diff --git a/release/lts/windowsservercore2004/meta.json b/release/lts/windowsservercore2004/meta.json
index a13a2edaf..7a71a2a1f 100644
--- a/release/lts/windowsservercore2004/meta.json
+++ b/release/lts/windowsservercore2004/meta.json
@@ -9,8 +9,7 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-2004-#fulltag#"
+        "lts-windowsservercore-#shorttag#"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json
index 7fc9aec13..7dc28e9a6 100644
--- a/release/lts/windowsservercore2022/meta.json
+++ b/release/lts/windowsservercore2022/meta.json
@@ -9,9 +9,7 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "lts-#psversion#-windowsservercore-#shorttag#",
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-#shorttag#-#fulltag#"
+        "lts-windowsservercore-#shorttag#"
     ],
     "manifestLists": [
         "lts"
diff --git a/release/lts/windowsservercore20H2/meta.json b/release/lts/windowsservercore20H2/meta.json
index c73832e77..393f7b96a 100644
--- a/release/lts/windowsservercore20H2/meta.json
+++ b/release/lts/windowsservercore20H2/meta.json
@@ -9,8 +9,7 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "lts-windowsservercore-#shorttag#",
-        "lts-windowsservercore-20H2-#fulltag#"
+        "lts-windowsservercore-#shorttag#"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/preview/alpine312/meta.json b/release/preview/alpine312/meta.json
index 7f98422ce..5258e540b 100644
--- a/release/preview/alpine312/meta.json
+++ b/release/preview/alpine312/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.12",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/alpine313/meta.json b/release/preview/alpine313/meta.json
index e446031e2..bb32c378d 100644
--- a/release/preview/alpine313/meta.json
+++ b/release/preview/alpine313/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/alpine314/meta.json b/release/preview/alpine314/meta.json
index 22cda249a..44df27412 100644
--- a/release/preview/alpine314/meta.json
+++ b/release/preview/alpine314/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
         "preview-alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/arm32v7/meta.json b/release/preview/arm32v7/meta.json
index dd09585d1..a77c0540e 100644
--- a/release/preview/arm32v7/meta.json
+++ b/release/preview/arm32v7/meta.json
@@ -7,11 +7,11 @@
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-#tag#",
         "preview-arm32v7-ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bionic"}
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
     ],
     "TestProperties": {
         "size": 550,
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
index cb644c99e..f53016dc3 100644
--- a/release/preview/centos7/meta.json
+++ b/release/preview/centos7/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
         "preview-centos-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/debian10/meta.json b/release/preview/debian10/meta.json
index 58f46e9e7..17f41e5ce 100644
--- a/release/preview/debian10/meta.json
+++ b/release/preview/debian10/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
-        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index 112274e80..531be06c2 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
-        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/debian9/meta.json b/release/preview/debian9/meta.json
index c90e87112..735420237 100644
--- a/release/preview/debian9/meta.json
+++ b/release/preview/debian9/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
-        "#psversion#-debian-#shorttag#",
         "preview-debian-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/fedora34/meta.json b/release/preview/fedora34/meta.json
index f48f89000..258ff5e63 100644
--- a/release/preview/fedora34/meta.json
+++ b/release/preview/fedora34/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-34-#fulltag#",
-        "#psversion#-fedora-34",
         "preview-fedora-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/mariner1/meta.json b/release/preview/mariner1/meta.json
index 5cf0d7ca2..38bd590d1 100644
--- a/release/preview/mariner1/meta.json
+++ b/release/preview/mariner1/meta.json
@@ -7,7 +7,6 @@
         {"Tag": "1.0"}
     ],
     "tagTemplates": [
-        "#psversion#-mariner-#tag#",
         "preview-mariner-#shorttag#"
     ],
     "SubImage": "test-deps",
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index 87793835c..604649a44 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -8,12 +8,11 @@
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1809-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
-    }
+    },
+    "UseAcr": true
 }
diff --git a/release/preview/nanoserver1909/meta.json b/release/preview/nanoserver1909/meta.json
index b9406d7c6..2c9d0800f 100644
--- a/release/preview/nanoserver1909/meta.json
+++ b/release/preview/nanoserver1909/meta.json
@@ -8,8 +8,6 @@
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1909-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/preview/nanoserver2004/meta.json b/release/preview/nanoserver2004/meta.json
index 4cd79b414..5d593d763 100644
--- a/release/preview/nanoserver2004/meta.json
+++ b/release/preview/nanoserver2004/meta.json
@@ -8,8 +8,6 @@
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-2004-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
index 9b65fc615..9295b8ae0 100644
--- a/release/preview/nanoserver2022/meta.json
+++ b/release/preview/nanoserver2022/meta.json
@@ -8,8 +8,6 @@
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-#shorttag#-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/preview/nanoserver20H2/meta.json b/release/preview/nanoserver20H2/meta.json
index d73b02076..c2df9df78 100644
--- a/release/preview/nanoserver20H2/meta.json
+++ b/release/preview/nanoserver20H2/meta.json
@@ -8,8 +8,6 @@
         }
     ],
     "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-20H2-#fulltag#",
         "preview-nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 803e98cc4..3f50d10d2 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "#psversion#-ubuntu-16.04-#fulltag#",
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index d2c37041f..bd3812d20 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
-        "#psversion#-ubuntu-#shorttag#",
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
index 1be304b2c..23718381b 100644
--- a/release/preview/ubuntu20.04/meta.json
+++ b/release/preview/ubuntu20.04/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Ubuntu 20.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
-        "#psversion#-ubuntu-#shorttag#",
         "preview-ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/preview/windowsserver2022/meta.json b/release/preview/windowsserver2022/meta.json
index 652feb0fb..2e9da61fd 100644
--- a/release/preview/windowsserver2022/meta.json
+++ b/release/preview/windowsserver2022/meta.json
@@ -9,8 +9,6 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsserver-#shorttag#",
-        "#psversion#-windowsserver-#shorttag#-#fulltag#",
         "preview-windowsserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/preview/windowsservercore1909/meta.json b/release/preview/windowsservercore1909/meta.json
index 24753388f..8afab62bd 100644
--- a/release/preview/windowsservercore1909/meta.json
+++ b/release/preview/windowsservercore1909/meta.json
@@ -9,8 +9,6 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1909-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/preview/windowsservercore2004/meta.json b/release/preview/windowsservercore2004/meta.json
index b855e3958..35ffed46a 100644
--- a/release/preview/windowsservercore2004/meta.json
+++ b/release/preview/windowsservercore2004/meta.json
@@ -9,8 +9,6 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-2004-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
index 35763865b..0a2eea588 100644
--- a/release/preview/windowsservercore2022/meta.json
+++ b/release/preview/windowsservercore2022/meta.json
@@ -12,8 +12,6 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/preview/windowsservercore20H2/meta.json b/release/preview/windowsservercore20H2/meta.json
index 3a60eb905..458451a01 100644
--- a/release/preview/windowsservercore20H2/meta.json
+++ b/release/preview/windowsservercore20H2/meta.json
@@ -9,8 +9,6 @@
     ],
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-20H2-#fulltag#",
         "preview-windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/release/servicing/centos7/getLatestTag.ps1 b/release/servicing/centos7/getLatestTag.ps1
deleted file mode 100644
index 2d9d1ce17..000000000
--- a/release/servicing/centos7/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the CentOS image on Docker
-
-# The versions of CentOS we care about
-$shortTags = @('7')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "centos" -FullTagFilter '^7$' -OnlyShortTags
diff --git a/release/servicing/debian9/getLatestTag.ps1 b/release/servicing/debian9/getLatestTag.ps1
deleted file mode 100644
index 22da10773..000000000
--- a/release/servicing/debian9/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the debian image on Docker
-
-# The versions of debian we care about
-$shortTags = @('stretch-slim')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9' -SkipShortTagFilter
diff --git a/release/servicing/nanoserver1809/getLatestTag.ps1 b/release/servicing/nanoserver1809/getLatestTag.ps1
deleted file mode 100644
index 9eb49e8e1..000000000
--- a/release/servicing/nanoserver1809/getLatestTag.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-
-param(
-    [Switch]
-    $CI,
-    # The versions of nanoserver we care about
-    [string[]]
-    $ShortTags
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '(\d|H){4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
-
diff --git a/release/servicing/opensuse423/getLatestTag.ps1 b/release/servicing/opensuse423/getLatestTag.ps1
deleted file mode 100644
index 5fad3693f..000000000
--- a/release/servicing/opensuse423/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the opensuse image on Docker
-
-# The versions of opensuse we care about
-$shortTags = @('42.3')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags
diff --git a/release/servicing/ubuntu16.04/getLatestTag.ps1 b/release/servicing/ubuntu16.04/getLatestTag.ps1
deleted file mode 100644
index ed6a85150..000000000
--- a/release/servicing/ubuntu16.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the xenial image on
-
-# The versions of xenial we care about
-$shortTags = @('xenial')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'xenial-\d{8}[\.\d{1}]?' -AlternativeShortTag '16.04'
diff --git a/release/servicing/ubuntu18.04/getLatestTag.ps1 b/release/servicing/ubuntu18.04/getLatestTag.ps1
deleted file mode 100644
index 162b83cde..000000000
--- a/release/servicing/ubuntu18.04/getLatestTag.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the beaver image on
-
-# The versions of beaver we care about
-$shortTags = @('bionic')
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath
-
-Get-DockerTags -ShortTags $shortTags -Image "ubuntu" -FullTagFilter 'bionic-\d{8}[\.\d{1}]?' -AlternativeShortTag '18.04'
diff --git a/release/servicing/windowsservercore/getLatestTag.ps1 b/release/servicing/windowsservercore/getLatestTag.ps1
deleted file mode 100644
index 554e8c399..000000000
--- a/release/servicing/windowsservercore/getLatestTag.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# return objects representing the tags we need to base the nanoserver image on
-
-param(
-    [Switch]
-    $CI
-)
-
-$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
-$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
-$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
-Import-Module $modulePath -Force
-
-# The versions of nanoserver we care about
-$shortTags = @('1809', '1903', '1909', '2004')
-
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '(\d|H){4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/alpine313/meta.json b/release/stable/alpine313/meta.json
index 6f3aeb169..8660e7601 100644
--- a/release/stable/alpine313/meta.json
+++ b/release/stable/alpine313/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/stable/alpine314/meta.json b/release/stable/alpine314/meta.json
index b50c60bb8..a7306fc67 100644
--- a/release/stable/alpine314/meta.json
+++ b/release/stable/alpine314/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "#psversion#-alpine-#shorttag#-#fulltag#",
+        "#psversion#-alpine-#shorttag#",
         "alpine-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/stable/arm32v7/meta.json b/release/stable/arm32v7/meta.json
index 6cf0b1d21..9b772c8a1 100644
--- a/release/stable/arm32v7/meta.json
+++ b/release/stable/arm32v7/meta.json
@@ -7,12 +7,12 @@
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-bionic-#fulltag#",
-        "#psversion#-arm32v7-ubuntu-18.04-#fulltag#",
+        "#psversion#-arm32v7-ubuntu-#shorttag#",
         "arm32v7-ubuntu-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "bionic"}
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
     ],
     "TestProperties": {
         "size": 550,
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index 4ccc7ff77..702f5cdd8 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
-        "#psversion#-centos-#shorttag#-#fulltag#",
+        "#psversion#-centos-#shorttag#",
         "centos-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/stable/debian10/meta.json b/release/stable/debian10/meta.json
index 7d70a28d4..aef74175d 100644
--- a/release/stable/debian10/meta.json
+++ b/release/stable/debian10/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
index ab829767e..162371132 100644
--- a/release/stable/debian11/meta.json
+++ b/release/stable/debian11/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 11 (Testing)",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/stable/debian9/meta.json b/release/stable/debian9/meta.json
index d4f3d28ae..3a520cf9c 100644
--- a/release/stable/debian9/meta.json
+++ b/release/stable/debian9/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-debian-#shorttag#-#fulltag#",
         "#psversion#-debian-#shorttag#",
         "debian-#shorttag#"
     ],
diff --git a/release/stable/fedora34/meta.json b/release/stable/fedora34/meta.json
index 59afcc30d..f962eba95 100644
--- a/release/stable/fedora34/meta.json
+++ b/release/stable/fedora34/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Fedora 32",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-fedora-34-#fulltag#",
         "#psversion#-fedora-34",
         "fedora-#shorttag#"
     ],
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index e6bd7be2b..8c6b185ba 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1809-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
@@ -18,5 +17,6 @@
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
-    }
+    },
+    "UseAcr": true
 }
diff --git a/release/stable/nanoserver1909/meta.json b/release/stable/nanoserver1909/meta.json
index 64a57cf93..701d33bfd 100644
--- a/release/stable/nanoserver1909/meta.json
+++ b/release/stable/nanoserver1909/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-1909-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/nanoserver2004/meta.json b/release/stable/nanoserver2004/meta.json
index 4e891438e..d10b78351 100644
--- a/release/stable/nanoserver2004/meta.json
+++ b/release/stable/nanoserver2004/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-2004-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/nanoserver2022/meta.json b/release/stable/nanoserver2022/meta.json
index 7dd344aaa..af1db936a 100644
--- a/release/stable/nanoserver2022/meta.json
+++ b/release/stable/nanoserver2022/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-#shorttag#-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/nanoserver20H2/meta.json b/release/stable/nanoserver20H2/meta.json
index 8b66993ba..02c16fb9d 100644
--- a/release/stable/nanoserver20H2/meta.json
+++ b/release/stable/nanoserver20H2/meta.json
@@ -9,7 +9,6 @@
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#shorttag#",
-        "#psversion#-nanoserver-20H2-#fulltag#",
         "nanoserver-#shorttag#"
     ],
     "Base64EncodePackageUrl": true,
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index b41a0cf42..a5e56835f 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -4,7 +4,7 @@
     "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
+        "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
     "shortTags": [
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index f82c093ce..4d410160d 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
         "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
diff --git a/release/stable/ubuntu20.04/meta.json b/release/stable/ubuntu20.04/meta.json
index f3d26f4bb..fe47f3de2 100644
--- a/release/stable/ubuntu20.04/meta.json
+++ b/release/stable/ubuntu20.04/meta.json
@@ -5,7 +5,6 @@
     "osVersion": "Ubuntu 20.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-#fulltag#",
         "#psversion#-ubuntu-#shorttag#",
         "ubuntu-#shorttag#"
     ],
diff --git a/release/stable/windowsserver2022/meta.json b/release/stable/windowsserver2022/meta.json
index da3e35cb8..b5738ca10 100644
--- a/release/stable/windowsserver2022/meta.json
+++ b/release/stable/windowsserver2022/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsserver-#shorttag#",
-        "#psversion#-windowsserver-#shorttag#-#fulltag#",
         "windowsserver-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/windowsservercore1909/meta.json b/release/stable/windowsservercore1909/meta.json
index fab03b5e4..3637edbd2 100644
--- a/release/stable/windowsservercore1909/meta.json
+++ b/release/stable/windowsservercore1909/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-1909-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/windowsservercore2004/meta.json b/release/stable/windowsservercore2004/meta.json
index 3df98f9c3..504d74601 100644
--- a/release/stable/windowsservercore2004/meta.json
+++ b/release/stable/windowsservercore2004/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-2004-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/windowsservercore2022/meta.json b/release/stable/windowsservercore2022/meta.json
index 1cc0b0a7f..71998ce09 100644
--- a/release/stable/windowsservercore2022/meta.json
+++ b/release/stable/windowsservercore2022/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-#shorttag#-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
diff --git a/release/stable/windowsservercore20H2/meta.json b/release/stable/windowsservercore20H2/meta.json
index 12a69024a..b78fbb521 100644
--- a/release/stable/windowsservercore20H2/meta.json
+++ b/release/stable/windowsservercore20H2/meta.json
@@ -10,7 +10,6 @@
     "Base64EncodePackageUrl": true,
     "tagTemplates": [
         "#psversion#-windowsservercore-#shorttag#",
-        "#psversion#-windowsservercore-20H2-#fulltag#",
         "windowsservercore-#shorttag#"
     ],
     "TestProperties": {
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index cec3340c2..29b451415 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -520,6 +520,7 @@ function Invoke-DockerBuild
         }
 
         $buildArgList += '--quiet'
+        $buildArgList += '--progress=plain'
     }
 
     foreach($argName in $buildArgNames)
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 1cb787a2c..24ee62fa2 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -437,13 +437,6 @@ function Get-DockerImageMetaDataWrapper
     $scriptPath = Join-Path -Path $imagePath -ChildPath 'getLatestTag.ps1'
     $metaJsonPath = Join-Path -Path $imagePath -ChildPath 'meta.json'
 
-    if ($env:FULL_TAG) {
-        $fullTag = $env:FULL_TAG
-    }
-    else {
-        $fullTag = (Get-Date).ToString("yyyyMMdd")
-    }
-
     $meta = Get-DockerImageMetaData -Path $metaJsonPath
 
     # if the image is broken and we shouldn't include known issues,
@@ -487,7 +480,7 @@ function Get-DockerImageMetaDataWrapper
             Write-Verbose "getting docker tag list"
             if($shortTags)
             {
-                $tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag
+                $tagDataFromScript = Get-DockerTagList -ShortTag $shortTags
             }
         }
     }
@@ -754,6 +747,10 @@ function Get-TagData
         $fromTag = $TagGroup.Name
     }
 
+    # remove any duplicate tags from the template formatting
+    $actualTags = $actualTags | Select-Object -Unique
+    $tagList = $tagList | Select-Object -Unique
+
     return [TagData]@{
         TagList = $tagList
         FromTag = $fromTag
@@ -777,9 +774,14 @@ function Format-TagTemplate {
         $Version
     )
 
-    $currentTag = $TagTemplate
+    $twoPartVersion = ($Version -split '\.(?=\d+([-]|$))')[0]
+
+    if(!$twoPartVersion)
+    {
+        throw "Version '$Version' is not in the expected format 'x.y.z' or 'x.y.z-preview.n'"
+    }
 
-    $fullTags = $tagGroup.Group | Where-Object {$_.Type -eq 'Full'}
+    $currentTag = $TagTemplate
 
     $actualMatrixTagTemplates = @()
     foreach($tag in $tagGroup.Group) {
@@ -790,33 +792,12 @@ function Format-TagTemplate {
         elseif ($currentTag -match '#shorttag#' -and $tag.Type -eq 'Short') {
             $actualMatrixTagTemplates += $currentTag.Replace('#shorttag#', $tag.Tag)
         }
-        elseif ($currentTag -notmatch '#shorttag#' -and $currentTag -match '#fulltag#' -and $tag.Type -eq 'Full') {
-            $actualMatrixTagTemplates += $currentTag.Replace('#fulltag#', $tag.Tag)
-        }
-    }
-
-    $actualFullTags = @()
-    if ($fullTags) {
-        foreach ($tag in $fullTags) {
-            foreach($currentTag in $actualMatrixTagTemplates)
-            {
-                if ($currentTag -match '#fulltag#' -and $tag.Type -eq 'Full') {
-                    $actualFullTags += $currentTag.Replace('#fulltag#', $tag.Tag)
-                }
-                else {
-                    $actualFullTags += $currentTag
-                }
-            }
-        }
-    }
-    else {
-        $actualFullTags = $actualMatrixTagTemplates
     }
 
     $actualTags = @()
-    foreach ($currentTag in $actualFullTags) {
+    foreach ($currentTag in $actualMatrixTagTemplates) {
         # Replace the the psversion token with the powershell version in the tag
-        $currentTag = $currentTag -replace '#psversion#', $Version
+        $currentTag = $currentTag -replace '#psversion#', $twoPartVersion
         $currentTag = $currentTag.ToLowerInvariant()
         $actualTags += $currentTag
     }
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index 411f0d754..4a39d439b 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -45,9 +45,7 @@ function Get-DockerTagList
 {
     param(
         [Parameter(Mandatory)]
-        [string[]] $ShortTag,
-        [Parameter(Mandatory)]
-        [string] $fullTag
+        [string[]] $ShortTag
     )
     $results = @()
 
@@ -60,13 +58,6 @@ function Get-DockerTagList
         }
     }
 
-    # Return the full form of the tag
-    $results += [UpstreamDockerTagData] @{
-        Type = 'Full'
-        Tag = $fullTag
-        FromTag = 'notUsed'
-    }
-
     return $results
 }
 
@@ -77,115 +68,7 @@ class UpstreamDockerTagData
     [string] $FromTag
 }
 
-# return objects representing the tags we need for a given Image
-function Get-DockerTags
-{
-    param(
-        [parameter(Mandatory)]
-        [string]
-        $Image,
-
-        [parameter(Mandatory)]
-        [string[]]
-        $ShortTags,
-
-        [parameter()]
-        [string]
-        $AlternativeShortTag,
-
-        [parameter(Mandatory)]
-        [string]
-        $FullTagFilter,
-
-        [Switch]
-        $OnlyShortTags,
-
-        [Switch]
-        $SkipShortTagFilter,
-
-        [switch]
-        $Mcr
-    )
-
-    if($ShortTags.Count -gt 1 -and $AlternativeShortTag)
-    {
-        throw "-AlternativeShortTag can only be used when there is only one -ShortTag"
-    }
-
-    # The versions of nanoserver we care about
-    $results = @()
-
-    # Get all the tags
-    if($Mcr.IsPresent)
-    {
-        $mcrImage = $Image -replace 'mcr\.microsoft\.com', ''
-        $tags = Get-DockerTagsList "https://mcr.microsoft.com/v2/$mcrImage/tags/list" -PropertyName tags
-    }
-    else {
-        if($image -match '/')
-        {
-            $dockerImage = $Image
-        }
-        else
-        {
-            $dockerImage = "library/$Image"
-        }
-
-        $tags = Get-DockerTagsList "https://registry.hub.docker.com/v2/repositories/$dockerImage/tags/" -PropertyName name
-    }
-
-    if(!$tags)
-    {
-        throw 'no results: '+$Image
-    }
-
-    foreach($shortTag in $ShortTags)
-    {
-        # filter to tags we care about
-        # then, to full tags
-        # then get the newest tag
-        $fullTag = $tags |
-            Where-Object{$SkipShortTagFilter.IsPresent -or $_ -like "${shortTag}*"} |
-                Where-Object{$_ -match $FullTagFilter} |
-                    Sort-Object -Descending |
-                        Select-Object -First 1
-
-        if($fullTag)
-        {
-            # Return the short form of the tag
-            $results += [UpstreamDockerTagData] @{
-                Type = 'Short'
-                Tag = $shortTag
-                FromTag = $fullTag
-            }
-
-            if($AlternativeShortTag)
-            {
-                # Return the short form of the tag
-                $results += [UpstreamDockerTagData] @{
-                    Type = 'Short'
-                    Tag = $AlternativeShortTag
-                    FromTag = $fullTag
-                }
-            }
-
-            if(!$OnlyShortTags.IsPresent)
-            {
-                # Return the full form of the tag
-                $results += [UpstreamDockerTagData] @{
-                    Type = 'Full'
-                    Tag = $fullTag
-                    FromTag = $fullTag
-                }
-            }
-        }
-    }
-
-    return $results
-}
-
 Export-ModuleMember -Function @(
-    'Get-DockerTags'
     'Get-DockerTagsList'
     'Get-DockerTagList'
 )

From 7370f2fbef565130ea22e87afcfd3f20c74a8888 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 18 Apr 2022 12:48:28 -0400
Subject: [PATCH 181/354] add ubi8.3 image (#624)

---
 release/preview/ubi83/docker/Dockerfile       | 65 +++++++++++++++++++
 release/preview/ubi83/meta.json               | 18 +++++
 .../preview/ubi83/test-deps/docker/Dockerfile | 21 ++++++
 release/preview/ubi83/test-deps/meta.json     | 19 ++++++
 release/stable/ubi83/docker/Dockerfile        | 63 ++++++++++++++++++
 release/stable/ubi83/meta.json                | 19 ++++++
 .../stable/ubi83/test-deps/docker/Dockerfile  | 21 ++++++
 release/stable/ubi83/test-deps/meta.json      | 20 ++++++
 8 files changed, 246 insertions(+)
 create mode 100644 release/preview/ubi83/docker/Dockerfile
 create mode 100644 release/preview/ubi83/meta.json
 create mode 100644 release/preview/ubi83/test-deps/docker/Dockerfile
 create mode 100644 release/preview/ubi83/test-deps/meta.json
 create mode 100644 release/stable/ubi83/docker/Dockerfile
 create mode 100644 release/stable/ubi83/meta.json
 create mode 100644 release/stable/ubi83/test-deps/docker/Dockerfile
 create mode 100644 release/stable/ubi83/test-deps/meta.json

diff --git a/release/preview/ubi83/docker/Dockerfile b/release/preview/ubi83/docker/Dockerfile
new file mode 100644
index 000000000..e796141c2
--- /dev/null
+++ b/release/preview/ubi83/docker/Dockerfile
@@ -0,0 +1,65 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi8/ubi:8.3 AS installer-env
+ARG PS_VERSION=7.3.0-preview.1
+ARG PACKAGE_VERSION=7.3.0_preview.1
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}-preview
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi8/ubi:8.3 AS final-image
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum update -y \
+    && yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum upgrade-minimal -y --security \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum update -y \
+    && yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    && yum upgrade-minimal -y --security \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}-preview \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.3
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/preview/ubi83/meta.json b/release/preview/ubi83/meta.json
new file mode 100644
index 000000000..d2affbb51
--- /dev/null
+++ b/release/preview/ubi83/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 8.3",
+    "FullRepository": "powershell/rhel",
+    "tagTemplates": [
+        "preview-ubi-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "8.3"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 726
+    }
+}
diff --git a/release/preview/ubi83/test-deps/docker/Dockerfile b/release/preview/ubi83/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..9d50edcfb
--- /dev/null
+++ b/release/preview/ubi83/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.3
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps-ng \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.3
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/preview/ubi83/test-deps/meta.json b/release/preview/ubi83/test-deps/meta.json
new file mode 100644
index 000000000..13aa782f4
--- /dev/null
+++ b/release/preview/ubi83/test-deps/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 8.3",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "8.3"}
+    ],
+    "tagTemplates": [
+        "preview-ubi-#shorttag#"
+    ],
+    "FullRepository": "powershell/rhel/test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 750
+    }
+}
diff --git a/release/stable/ubi83/docker/Dockerfile b/release/stable/ubi83/docker/Dockerfile
new file mode 100644
index 000000000..768f2da6f
--- /dev/null
+++ b/release/stable/ubi83/docker/Dockerfile
@@ -0,0 +1,63 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi8/ubi:8.3 AS installer-env
+ARG PS_VERSION=7.2.2
+ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi8/ubi:8.3 AS final-image
+ARG PS_VERSION=7.2.2
+ARG PS_INSTALL_VERSION=7
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum update -y \
+    && yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum upgrade-minimal -y --security \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum update -y \
+    && yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    && yum upgrade-minimal -y --security \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.3
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh"]
diff --git a/release/stable/ubi83/meta.json b/release/stable/ubi83/meta.json
new file mode 100644
index 000000000..d1e809c36
--- /dev/null
+++ b/release/stable/ubi83/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 8.3",
+    "FullRepository": "powershell/rhel",
+    "tagTemplates": [
+        "#psversion#-ubi-#shorttag#",
+        "ubi-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "8.3"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 725
+    }
+}
diff --git a/release/stable/ubi83/test-deps/docker/Dockerfile b/release/stable/ubi83/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..9d50edcfb
--- /dev/null
+++ b/release/stable/ubi83/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.3
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps-ng \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.3
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/stable/ubi83/test-deps/meta.json b/release/stable/ubi83/test-deps/meta.json
new file mode 100644
index 000000000..551d54da1
--- /dev/null
+++ b/release/stable/ubi83/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 8.3",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "8.3"}
+    ],
+    "tagTemplates": [
+        "#psversion#-ubi-#shorttag#",
+        "ubi-#shorttag#"
+    ],
+    "FullRepository": "powershell/rhel/test-deps",
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 750
+    }
+}

From 0eb4f1c7e82aa3bef8e9e7bb76caaceae33ba0a4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Apr 2022 12:32:23 -0700
Subject: [PATCH 182/354] Add EOL and DistributionState metadata for each image
 (#629)

---
 .vscode/launch.json                           | 27 +++++++-
 build.ps1                                     | 50 +++++++++------
 release/7-1/debian11/meta.json                |  2 +-
 release/lts/arm32v7/meta.json                 |  4 +-
 release/lts/centos7/meta.json                 |  4 +-
 release/lts/debian10/meta.json                |  5 +-
 release/lts/debian11/meta.json                |  6 +-
 release/lts/nanoserver1809/meta.json          |  4 +-
 release/lts/nanoserver1909/meta.json          |  4 +-
 release/lts/nanoserver2004/meta.json          |  4 +-
 release/lts/nanoserver2022/meta.json          |  4 +-
 release/lts/nanoserver20H2/meta.json          |  3 +-
 release/lts/ubuntu16.04/meta.json             |  4 +-
 release/lts/ubuntu18.04/meta.json             |  4 +-
 release/lts/windowsserver2022/meta.json       |  4 +-
 release/lts/windowsservercore1909/meta.json   |  4 +-
 release/lts/windowsservercore2004/meta.json   | 10 +--
 release/lts/windowsservercore2022/meta.json   |  4 +-
 release/lts/windowsservercore20H2/meta.json   |  2 +
 release/preview/alpine312/meta.json           |  4 +-
 release/preview/alpine313/meta.json           |  4 +-
 release/preview/alpine314/meta.json           |  4 +-
 release/preview/arm32v7/meta.json             |  4 +-
 release/preview/centos7/meta.json             |  4 +-
 release/preview/debian10/meta.json            |  4 +-
 release/preview/debian11/meta.json            |  6 +-
 release/preview/debian9/meta.json             |  4 +-
 release/preview/fedora34/meta.json            |  4 +-
 release/preview/mariner1/meta.json            |  4 +-
 release/preview/nanoserver1809/meta.json      |  4 +-
 release/preview/nanoserver1909/meta.json      |  4 +-
 release/preview/nanoserver2004/meta.json      |  4 +-
 release/preview/nanoserver2022/meta.json      |  4 +-
 release/preview/nanoserver20H2/meta.json      |  2 +
 .../{ubi83 => ubi84}/docker/Dockerfile        |  4 +-
 release/preview/{ubi83 => ubi84}/meta.json    |  8 ++-
 .../ubi84}/test-deps/docker/Dockerfile        |  2 +-
 .../{ubi83 => ubi84}/test-deps/meta.json      |  8 ++-
 release/preview/ubuntu16.04/meta.json         |  4 +-
 release/preview/ubuntu18.04/meta.json         |  4 +-
 release/preview/ubuntu20.04/meta.json         |  4 +-
 release/preview/windowsserver2022/meta.json   |  4 +-
 .../preview/windowsservercore1909/meta.json   |  4 +-
 .../preview/windowsservercore2004/meta.json   |  4 +-
 .../preview/windowsservercore2022/meta.json   |  4 +-
 .../preview/windowsservercore20H2/meta.json   |  2 +
 release/stable/alpine313/meta.json            |  4 +-
 release/stable/alpine314/meta.json            |  4 +-
 release/stable/arm32v7/meta.json              |  4 +-
 release/stable/centos7/meta.json              |  4 +-
 release/stable/debian10/meta.json             |  4 +-
 release/stable/debian11/meta.json             |  6 +-
 release/stable/debian9/meta.json              |  4 +-
 release/stable/fedora34/meta.json             |  6 +-
 release/stable/nanoserver1809/meta.json       |  4 +-
 release/stable/nanoserver1909/meta.json       |  4 +-
 release/stable/nanoserver2004/meta.json       |  4 +-
 release/stable/nanoserver2022/meta.json       |  4 +-
 release/stable/nanoserver20H2/meta.json       |  2 +
 .../stable/{ubi83 => ubi84}/docker/Dockerfile |  4 +-
 release/stable/{ubi83 => ubi84}/meta.json     |  8 ++-
 .../ubi84}/test-deps/docker/Dockerfile        |  2 +-
 .../{ubi83 => ubi84}/test-deps/meta.json      |  8 ++-
 release/stable/ubuntu16.04/meta.json          |  4 +-
 release/stable/ubuntu18.04/meta.json          |  4 +-
 release/stable/ubuntu20.04/meta.json          |  4 +-
 release/stable/windowsserver2022/meta.json    |  4 +-
 .../stable/windowsservercore1909/meta.json    |  4 +-
 .../stable/windowsservercore2004/meta.json    |  4 +-
 .../stable/windowsservercore2022/meta.json    |  4 +-
 .../stable/windowsservercore20H2/meta.json    |  2 +
 tools/buildHelper/buildHelper.psm1            | 61 ++++++++++++++++++-
 72 files changed, 325 insertions(+), 103 deletions(-)
 rename release/preview/{ubi83 => ubi84}/docker/Dockerfile (95%)
 rename release/preview/{ubi83 => ubi84}/meta.json (71%)
 rename release/{stable/ubi83 => preview/ubi84}/test-deps/docker/Dockerfile (90%)
 rename release/preview/{ubi83 => ubi84}/test-deps/meta.json (69%)
 rename release/stable/{ubi83 => ubi84}/docker/Dockerfile (95%)
 rename release/stable/{ubi83 => ubi84}/meta.json (72%)
 rename release/{preview/ubi83 => stable/ubi84}/test-deps/docker/Dockerfile (90%)
 rename release/stable/{ubi83 => ubi84}/test-deps/meta.json (70%)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0a251eb34..6815977d1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,6 +4,15 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "PowerShell: Build Unit Tests",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "Invoke-Pester",
+            "cwd": "${workspaceFolder}/unittests",
+            "args": [
+            ]
+        },
         {
             "name": "PowerShell: Build LTS Ubuntu 16.04",
             "type": "PowerShell",
@@ -13,9 +22,9 @@
             "args": [
                 "-build",
                 "-Channel",
-                "lts",
+                "preview",
                 "-name",
-                "ubuntu16.04"
+                "mariner1"
             ]
         },
         {
@@ -33,6 +42,20 @@
                 "-format",
                 "JSON"
             ]
+        },
+        {
+            "name": "PowerShell: check for dups",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${workspaceFolder}/build.ps1",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "-CheckForDuplicateTags",
+                "-Channel",
+                "preview,",
+                "stable,",
+                "lts"
+            ]
         }
     ]
 
diff --git a/build.ps1 b/build.ps1
index fe362ccea..931408813 100755
--- a/build.ps1
+++ b/build.ps1
@@ -34,6 +34,10 @@ param(
     [switch]
     $GenerateMatrixJson,
 
+    [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [switch]
+    $FullJson,
+
     [Parameter(Mandatory, ParameterSetName="GenerateManifestLists")]
     [switch]
     $GenerateManifestLists,
@@ -219,7 +223,10 @@ DynamicParam {
 }
 
 Begin {
-    $ENV:DOCKER_BUILDKIT=1
+    if (!$IsWindows) {
+        $ENV:DOCKER_BUILDKIT = 1
+    }
+
     if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
@@ -242,6 +249,7 @@ End {
     $tagGroups = @{}
     $dupeCheckTable = @{}
     $dupeTagIssues = @()
+    $fullMatrix = @{}
 
     $toBuild = @()
     foreach ($actualChannel in $Channels) {
@@ -440,6 +448,8 @@ End {
                             UseAcr          = $UseAcr
                             ContinueOnError = $continueOnError
                             ManifestLists   = $manifestLists
+                            EndOfLife         = $allMeta.meta.EndOfLife
+                            DistributionState = $allMeta.meta.GetDistributionState().ToString()
                         }
 
                         $tagGroups[$tagGroup] += $tag
@@ -463,7 +473,6 @@ End {
         $testArgPath = Join-Path -Path $testsPath -ChildPath 'testArgs.json'
         $testArgList | ConvertTo-Json -Depth 2 | Out-File -FilePath $testArgPath
 
-        Write-Verbose "Launching pester..." -Verbose
         $extraParams = @{}
         if($Test.IsPresent)
         {
@@ -495,17 +504,7 @@ End {
             $extraParams.Add('Tags', $tags)
         }
 
-        if(!(Get-Module -ListAvailable pester -ErrorAction Ignore) -or $ForcePesterInstall.IsPresent)
-        {
-            Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
-        }
-
-        Write-Verbose -Message "logging to $logPath" -Verbose
-        $results = Invoke-Pester -Script $testsPath -OutputFile $logPath -PassThru -OutputFormat NUnitXml @extraParams
-        if(!$results -or $results.FailedCount -gt 0 -or !$results.TotalCount)
-        {
-            throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount) Total: $($results.TotalCount)"
-        }
+        Invoke-PesterWrapper -Script $testsPath -OutputFile $logPath -ExtraParams $extraParams
     }
 
     # print local image names
@@ -579,10 +578,13 @@ End {
                         $jobName = $tag.Name -replace '-', '_'
                         if (-not $matrix.$channelName[$osName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
                             $matrix.$channelName[$osName].Add($jobName, @{
-                                    Channel         = $tag.Channel
-                                    ImageName       = $tag.Name
-                                    JobName         = $jobName
-                                    ContinueOnError = $tag.ContinueOnError
+                                    Channel           = $tag.Channel
+                                    ImageName         = $tag.Name
+                                    JobName           = $jobName
+                                    ContinueOnError   = $tag.ContinueOnError
+                                    EndOfLife         = $tag.EndOfLife
+                                    DistributionState = $tag.DistributionState
+                                    OsVersion         = $tag.OsVersion
                                 })
                         }
                     }
@@ -591,15 +593,25 @@ End {
         }
 
         foreach ($channelName in $matrix.Keys) {
+            $fullMatrix[$channelName] = @()
             foreach ($osName in $matrix.$channelName.Keys) {
                 $osMatrix = $matrix.$channelName.$osName
+                $fullMatrix[$channelName] += $osMatrix.Values
                 $matrixJson = $osMatrix | ConvertTo-Json -Compress
                 $variableName = "matrix_${channelName}_${osName}"
                 $command = "vso[task.setvariable variable=$variableName;isoutput=true]$($matrixJson)"
-                Write-Verbose "sending command: '$command'"
-                Write-Host "##$command"
+                if (!$FullJson) {
+                    Set-Item -Path ENV:$VariableName -Value $matrixJson
+                    Write-Verbose "sending command: '$command'"
+                    Write-Host "##$command"
+                }
             }
         }
+
+        if($FullJson) {
+            $matrixJson = $fullMatrix | ConvertTo-Json -Depth 100
+            Write-Output $matrixJson
+        }
     }
 
     if ($GenerateManifestLists.IsPresent) {
diff --git a/release/7-1/debian11/meta.json b/release/7-1/debian11/meta.json
index 162371132..db901de4b 100644
--- a/release/7-1/debian11/meta.json
+++ b/release/7-1/debian11/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion" : false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11 (Testing)",
+    "osVersion": "Debian 11",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-debian-#shorttag#",
diff --git a/release/lts/arm32v7/meta.json b/release/lts/arm32v7/meta.json
index 5c7bf10f8..d9b61729b 100644
--- a/release/lts/arm32v7/meta.json
+++ b/release/lts/arm32v7/meta.json
@@ -15,5 +15,7 @@
     "TestProperties": {
         "size": 550,
         "Arm32": true
-    }
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
index 7db53ca58..7ba036a1a 100644
--- a/release/lts/centos7/meta.json
+++ b/release/lts/centos7/meta.json
@@ -12,5 +12,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 585
-    }
+    },
+    "EndOfLife": "2020-08-06",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/debian10/meta.json b/release/lts/debian10/meta.json
index c49872a0c..a2b3877c6 100644
--- a/release/lts/debian10/meta.json
+++ b/release/lts/debian10/meta.json
@@ -14,5 +14,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2024-06-01",
+    "DistributionState": "Validated"
 }
+
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
index 161bed3ea..c8a08a57b 100644
--- a/release/lts/debian11/meta.json
+++ b/release/lts/debian11/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion" : false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11 (Testing)",
+    "osVersion": "Debian 11",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "lts-debian-#shorttag#"
@@ -14,6 +14,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
 
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
index f051b1a4c..839fb843e 100644
--- a/release/lts/nanoserver1809/meta.json
+++ b/release/lts/nanoserver1809/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-01-09",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/nanoserver1909/meta.json b/release/lts/nanoserver1909/meta.json
index 96f86a0fc..39c88dca5 100644
--- a/release/lts/nanoserver1909/meta.json
+++ b/release/lts/nanoserver1909/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/nanoserver2004/meta.json b/release/lts/nanoserver2004/meta.json
index e5eee0bbb..e75bef35c 100644
--- a/release/lts/nanoserver2004/meta.json
+++ b/release/lts/nanoserver2004/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json
index 09d851a21..ceb5d3ef4 100644
--- a/release/lts/nanoserver2022/meta.json
+++ b/release/lts/nanoserver2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/nanoserver20H2/meta.json b/release/lts/nanoserver20H2/meta.json
index 312314cb8..0fa59bda4 100644
--- a/release/lts/nanoserver20H2/meta.json
+++ b/release/lts/nanoserver20H2/meta.json
@@ -15,5 +15,6 @@
         "size": 1
     },
     "UseAcr": true,
-    "IsBroken": false
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/ubuntu16.04/meta.json b/release/lts/ubuntu16.04/meta.json
index 1317249c5..33909d5c2 100644
--- a/release/lts/ubuntu16.04/meta.json
+++ b/release/lts/ubuntu16.04/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 395
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2021-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
index b0036152c..ec181e93a 100644
--- a/release/lts/ubuntu18.04/meta.json
+++ b/release/lts/ubuntu18.04/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 355
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/windowsserver2022/meta.json b/release/lts/windowsserver2022/meta.json
index 43f00a549..3ea8a0241 100644
--- a/release/lts/windowsserver2022/meta.json
+++ b/release/lts/windowsserver2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/windowsservercore1909/meta.json b/release/lts/windowsservercore1909/meta.json
index 05812a50c..b74c6549f 100644
--- a/release/lts/windowsservercore1909/meta.json
+++ b/release/lts/windowsservercore1909/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/windowsservercore2004/meta.json b/release/lts/windowsservercore2004/meta.json
index 7a71a2a1f..66821a4de 100644
--- a/release/lts/windowsservercore2004/meta.json
+++ b/release/lts/windowsservercore2004/meta.json
@@ -11,11 +11,13 @@
     "tagTemplates": [
         "lts-windowsservercore-#shorttag#"
     ],
-    "TestProperties": {
-        "size": 1
-    },
     "manifestLists": [
         "lts"
     ],
-    "UseAcr": true
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json
index 7dc28e9a6..c582b088c 100644
--- a/release/lts/windowsservercore2022/meta.json
+++ b/release/lts/windowsservercore2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/lts/windowsservercore20H2/meta.json b/release/lts/windowsservercore20H2/meta.json
index 393f7b96a..4765fd725 100644
--- a/release/lts/windowsservercore20H2/meta.json
+++ b/release/lts/windowsservercore20H2/meta.json
@@ -15,4 +15,6 @@
         "size": 1
     },
     "UseAcr": true,
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/alpine312/meta.json b/release/preview/alpine312/meta.json
index 5258e540b..e1bd2beed 100644
--- a/release/preview/alpine312/meta.json
+++ b/release/preview/alpine312/meta.json
@@ -13,5 +13,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 230
-    }
+    },
+    "EndOfLife": "2022-05-01",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/alpine313/meta.json b/release/preview/alpine313/meta.json
index bb32c378d..021767a8b 100644
--- a/release/preview/alpine313/meta.json
+++ b/release/preview/alpine313/meta.json
@@ -13,5 +13,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 221
-    }
+    },
+    "EndOfLife": "2022-11-01",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/alpine314/meta.json b/release/preview/alpine314/meta.json
index 44df27412..a556e0a08 100644
--- a/release/preview/alpine314/meta.json
+++ b/release/preview/alpine314/meta.json
@@ -13,5 +13,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 221
-    }
+    },
+    "EndOfLife": "2023-05-01",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/arm32v7/meta.json b/release/preview/arm32v7/meta.json
index a77c0540e..ff62cf6fe 100644
--- a/release/preview/arm32v7/meta.json
+++ b/release/preview/arm32v7/meta.json
@@ -16,5 +16,7 @@
     "TestProperties": {
         "size": 550,
         "Arm32": true
-    }
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
index f53016dc3..f1f75cc1c 100644
--- a/release/preview/centos7/meta.json
+++ b/release/preview/centos7/meta.json
@@ -12,5 +12,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 586
-    }
+    },
+    "EndOfLife": "2020-08-06",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/debian10/meta.json b/release/preview/debian10/meta.json
index 17f41e5ce..49c40a0db 100644
--- a/release/preview/debian10/meta.json
+++ b/release/preview/debian10/meta.json
@@ -14,6 +14,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
 
diff --git a/release/preview/debian11/meta.json b/release/preview/debian11/meta.json
index 531be06c2..cfc93d5f6 100644
--- a/release/preview/debian11/meta.json
+++ b/release/preview/debian11/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion" : false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11 (Testing)",
+    "osVersion": "Debian 11",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "preview-debian-#shorttag#"
@@ -14,6 +14,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 350
-    }
+    },
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
 
diff --git a/release/preview/debian9/meta.json b/release/preview/debian9/meta.json
index 735420237..9ea5daac9 100644
--- a/release/preview/debian9/meta.json
+++ b/release/preview/debian9/meta.json
@@ -14,5 +14,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2022-06-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/fedora34/meta.json b/release/preview/fedora34/meta.json
index 258ff5e63..1be216a3e 100644
--- a/release/preview/fedora34/meta.json
+++ b/release/preview/fedora34/meta.json
@@ -13,5 +13,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
-    }
+    },
+    "EndOfLife": "2022-05-17",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/mariner1/meta.json b/release/preview/mariner1/meta.json
index 38bd590d1..c333c721a 100644
--- a/release/preview/mariner1/meta.json
+++ b/release/preview/mariner1/meta.json
@@ -12,5 +12,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 387
-    }
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validating"
 }
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index 604649a44..680966092 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": false,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/nanoserver1909/meta.json b/release/preview/nanoserver1909/meta.json
index 2c9d0800f..3b378616d 100644
--- a/release/preview/nanoserver1909/meta.json
+++ b/release/preview/nanoserver1909/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/nanoserver2004/meta.json b/release/preview/nanoserver2004/meta.json
index 5d593d763..45b84e532 100644
--- a/release/preview/nanoserver2004/meta.json
+++ b/release/preview/nanoserver2004/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json
index 9295b8ae0..9de0db71a 100644
--- a/release/preview/nanoserver2022/meta.json
+++ b/release/preview/nanoserver2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/nanoserver20H2/meta.json b/release/preview/nanoserver20H2/meta.json
index c2df9df78..8745acfdb 100644
--- a/release/preview/nanoserver20H2/meta.json
+++ b/release/preview/nanoserver20H2/meta.json
@@ -15,4 +15,6 @@
         "size": 1
     },
     "UseAcr": true,
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/ubi83/docker/Dockerfile b/release/preview/ubi84/docker/Dockerfile
similarity index 95%
rename from release/preview/ubi83/docker/Dockerfile
rename to release/preview/ubi84/docker/Dockerfile
index e796141c2..9fa4bb35b 100644
--- a/release/preview/ubi83/docker/Dockerfile
+++ b/release/preview/ubi84/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.2
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.3 AS installer-env
+FROM registry.access.redhat.com/ubi8/ubi:8.4 AS installer-env
 ARG PS_VERSION=7.3.0-preview.1
 ARG PACKAGE_VERSION=7.3.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
@@ -14,7 +14,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}-preview
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.3 AS final-image
+FROM registry.access.redhat.com/ubi8/ubi:8.4 AS final-image
 ARG PS_VERSION=7.3.0-preview.1
 ARG PS_INSTALL_VERSION=7
 
diff --git a/release/preview/ubi83/meta.json b/release/preview/ubi84/meta.json
similarity index 71%
rename from release/preview/ubi83/meta.json
rename to release/preview/ubi84/meta.json
index d2affbb51..d37173ede 100644
--- a/release/preview/ubi83/meta.json
+++ b/release/preview/ubi84/meta.json
@@ -3,16 +3,18 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8.3",
+    "osVersion": "Universal Base Image 8.4",
     "FullRepository": "powershell/rhel",
     "tagTemplates": [
         "preview-ubi-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "8.3"}
+        {"Tag": "8.4"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 726
-    }
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
 }
diff --git a/release/stable/ubi83/test-deps/docker/Dockerfile b/release/preview/ubi84/test-deps/docker/Dockerfile
similarity index 90%
rename from release/stable/ubi83/test-deps/docker/Dockerfile
rename to release/preview/ubi84/test-deps/docker/Dockerfile
index 9d50edcfb..93b5a5f62 100644
--- a/release/stable/ubi83/test-deps/docker/Dockerfile
+++ b/release/preview/ubi84/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.3
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
 
 FROM ${BaseImage}
 
diff --git a/release/preview/ubi83/test-deps/meta.json b/release/preview/ubi84/test-deps/meta.json
similarity index 69%
rename from release/preview/ubi83/test-deps/meta.json
rename to release/preview/ubi84/test-deps/meta.json
index 13aa782f4..73dcbdbe8 100644
--- a/release/preview/ubi83/test-deps/meta.json
+++ b/release/preview/ubi84/test-deps/meta.json
@@ -1,10 +1,10 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8.3",
+    "osVersion": "Universal Base Image 8.4",
     "SkipGssNtlmSspTests": true,
     "shortTags": [
-        {"Tag": "8.3"}
+        {"Tag": "8.4"}
     ],
     "tagTemplates": [
         "preview-ubi-#shorttag#"
@@ -15,5 +15,7 @@
     ],
     "TestProperties": {
         "size": 750
-    }
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
 }
diff --git a/release/preview/ubuntu16.04/meta.json b/release/preview/ubuntu16.04/meta.json
index 3f50d10d2..3bc25fa81 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/preview/ubuntu16.04/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 395
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2021-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/ubuntu18.04/meta.json b/release/preview/ubuntu18.04/meta.json
index bd3812d20..4f991379d 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/preview/ubuntu18.04/meta.json
@@ -14,5 +14,7 @@
     "TestProperties": {
         "size": 355
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/ubuntu20.04/meta.json b/release/preview/ubuntu20.04/meta.json
index 23718381b..44866a878 100644
--- a/release/preview/ubuntu20.04/meta.json
+++ b/release/preview/ubuntu20.04/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 355
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/windowsserver2022/meta.json b/release/preview/windowsserver2022/meta.json
index 2e9da61fd..08215f237 100644
--- a/release/preview/windowsserver2022/meta.json
+++ b/release/preview/windowsserver2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/windowsservercore1909/meta.json b/release/preview/windowsservercore1909/meta.json
index 8afab62bd..ee1cf19c6 100644
--- a/release/preview/windowsservercore1909/meta.json
+++ b/release/preview/windowsservercore1909/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/windowsservercore2004/meta.json b/release/preview/windowsservercore2004/meta.json
index 35ffed46a..18eca72a6 100644
--- a/release/preview/windowsservercore2004/meta.json
+++ b/release/preview/windowsservercore2004/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json
index 0a2eea588..a587382c6 100644
--- a/release/preview/windowsservercore2022/meta.json
+++ b/release/preview/windowsservercore2022/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
 }
diff --git a/release/preview/windowsservercore20H2/meta.json b/release/preview/windowsservercore20H2/meta.json
index 458451a01..f6a09af61 100644
--- a/release/preview/windowsservercore20H2/meta.json
+++ b/release/preview/windowsservercore20H2/meta.json
@@ -15,4 +15,6 @@
         "size": 1
     },
     "UseAcr": true,
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/alpine313/meta.json b/release/stable/alpine313/meta.json
index 8660e7601..7fe8b9cd9 100644
--- a/release/stable/alpine313/meta.json
+++ b/release/stable/alpine313/meta.json
@@ -14,5 +14,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 221
-    }
+    },
+    "EndOfLife": "2022-11-01",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/alpine314/meta.json b/release/stable/alpine314/meta.json
index a7306fc67..0f41a4eff 100644
--- a/release/stable/alpine314/meta.json
+++ b/release/stable/alpine314/meta.json
@@ -14,5 +14,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 221
-    }
+    },
+    "EndOfLife": "2023-05-01",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/arm32v7/meta.json b/release/stable/arm32v7/meta.json
index 9b772c8a1..1de5cccd9 100644
--- a/release/stable/arm32v7/meta.json
+++ b/release/stable/arm32v7/meta.json
@@ -17,5 +17,7 @@
     "TestProperties": {
         "size": 550,
         "Arm32": true
-    }
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
index 702f5cdd8..c563a0944 100644
--- a/release/stable/centos7/meta.json
+++ b/release/stable/centos7/meta.json
@@ -13,5 +13,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 577
-    }
+    },
+    "EndOfLife": "2020-08-06",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/debian10/meta.json b/release/stable/debian10/meta.json
index aef74175d..75e439417 100644
--- a/release/stable/debian10/meta.json
+++ b/release/stable/debian10/meta.json
@@ -15,6 +15,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2024-06-01",
+    "DistributionState": "Validated"
 }
 
diff --git a/release/stable/debian11/meta.json b/release/stable/debian11/meta.json
index 162371132..31c8d6614 100644
--- a/release/stable/debian11/meta.json
+++ b/release/stable/debian11/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion" : false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11 (Testing)",
+    "osVersion": "Debian 11",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-debian-#shorttag#",
@@ -15,6 +15,8 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 350
-    }
+    },
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
 
diff --git a/release/stable/debian9/meta.json b/release/stable/debian9/meta.json
index 3a520cf9c..bcb9887ae 100644
--- a/release/stable/debian9/meta.json
+++ b/release/stable/debian9/meta.json
@@ -15,5 +15,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 314
-    }
+    },
+    "EndOfLife": "2022-06-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/fedora34/meta.json b/release/stable/fedora34/meta.json
index f962eba95..cc5e4c5c2 100644
--- a/release/stable/fedora34/meta.json
+++ b/release/stable/fedora34/meta.json
@@ -2,7 +2,7 @@
     "IsLinux": true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "Fedora 32",
+    "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-34",
@@ -14,5 +14,7 @@
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 632
-    }
+    },
+    "EndOfLife": "2022-05-17",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index 8c6b185ba..d78a1c88d 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": false,
+    "EndOfLife": "2024-01-09",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/nanoserver1909/meta.json b/release/stable/nanoserver1909/meta.json
index 701d33bfd..1d9be915f 100644
--- a/release/stable/nanoserver1909/meta.json
+++ b/release/stable/nanoserver1909/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/nanoserver2004/meta.json b/release/stable/nanoserver2004/meta.json
index d10b78351..e835e2375 100644
--- a/release/stable/nanoserver2004/meta.json
+++ b/release/stable/nanoserver2004/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/nanoserver2022/meta.json b/release/stable/nanoserver2022/meta.json
index af1db936a..3709f4f92 100644
--- a/release/stable/nanoserver2022/meta.json
+++ b/release/stable/nanoserver2022/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/nanoserver20H2/meta.json b/release/stable/nanoserver20H2/meta.json
index 02c16fb9d..5bc868741 100644
--- a/release/stable/nanoserver20H2/meta.json
+++ b/release/stable/nanoserver20H2/meta.json
@@ -16,4 +16,6 @@
         "size": 1
     },
     "UseAcr": true,
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/ubi83/docker/Dockerfile b/release/stable/ubi84/docker/Dockerfile
similarity index 95%
rename from release/stable/ubi83/docker/Dockerfile
rename to release/stable/ubi84/docker/Dockerfile
index 768f2da6f..e38c8a567 100644
--- a/release/stable/ubi83/docker/Dockerfile
+++ b/release/stable/ubi84/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.2
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.3 AS installer-env
+FROM registry.access.redhat.com/ubi8/ubi:8.4 AS installer-env
 ARG PS_VERSION=7.2.2
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
@@ -12,7 +12,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.3 AS final-image
+FROM registry.access.redhat.com/ubi8/ubi:8.4 AS final-image
 ARG PS_VERSION=7.2.2
 ARG PS_INSTALL_VERSION=7
 
diff --git a/release/stable/ubi83/meta.json b/release/stable/ubi84/meta.json
similarity index 72%
rename from release/stable/ubi83/meta.json
rename to release/stable/ubi84/meta.json
index d1e809c36..6875730be 100644
--- a/release/stable/ubi83/meta.json
+++ b/release/stable/ubi84/meta.json
@@ -3,17 +3,19 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8.3",
+    "osVersion": "Universal Base Image 8.4",
     "FullRepository": "powershell/rhel",
     "tagTemplates": [
         "#psversion#-ubi-#shorttag#",
         "ubi-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "8.3"}
+        {"Tag": "8.4"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 725
-    }
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
 }
diff --git a/release/preview/ubi83/test-deps/docker/Dockerfile b/release/stable/ubi84/test-deps/docker/Dockerfile
similarity index 90%
rename from release/preview/ubi83/test-deps/docker/Dockerfile
rename to release/stable/ubi84/test-deps/docker/Dockerfile
index 9d50edcfb..93b5a5f62 100644
--- a/release/preview/ubi83/test-deps/docker/Dockerfile
+++ b/release/stable/ubi84/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.3
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
 
 FROM ${BaseImage}
 
diff --git a/release/stable/ubi83/test-deps/meta.json b/release/stable/ubi84/test-deps/meta.json
similarity index 70%
rename from release/stable/ubi83/test-deps/meta.json
rename to release/stable/ubi84/test-deps/meta.json
index 551d54da1..408f5074c 100644
--- a/release/stable/ubi83/test-deps/meta.json
+++ b/release/stable/ubi84/test-deps/meta.json
@@ -1,10 +1,10 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8.3",
+    "osVersion": "Universal Base Image 8.4",
     "SkipGssNtlmSspTests": true,
     "shortTags": [
-        {"Tag": "8.3"}
+        {"Tag": "8.4"}
     ],
     "tagTemplates": [
         "#psversion#-ubi-#shorttag#",
@@ -16,5 +16,7 @@
     ],
     "TestProperties": {
         "size": 750
-    }
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
 }
diff --git a/release/stable/ubuntu16.04/meta.json b/release/stable/ubuntu16.04/meta.json
index a5e56835f..ec6767b4e 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/stable/ubuntu16.04/meta.json
@@ -15,5 +15,7 @@
     "TestProperties": {
         "size": 395
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2021-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/ubuntu18.04/meta.json b/release/stable/ubuntu18.04/meta.json
index 4d410160d..e3541693c 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/stable/ubuntu18.04/meta.json
@@ -15,5 +15,7 @@
     "TestProperties": {
         "size": 355
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/ubuntu20.04/meta.json b/release/stable/ubuntu20.04/meta.json
index fe47f3de2..14b33330d 100644
--- a/release/stable/ubuntu20.04/meta.json
+++ b/release/stable/ubuntu20.04/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 355
     },
-    "SubImage": "test-deps"
+    "SubImage": "test-deps",
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/windowsserver2022/meta.json b/release/stable/windowsserver2022/meta.json
index b5738ca10..78225539d 100644
--- a/release/stable/windowsserver2022/meta.json
+++ b/release/stable/windowsserver2022/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/windowsservercore1909/meta.json b/release/stable/windowsservercore1909/meta.json
index 3637edbd2..5aebfc09a 100644
--- a/release/stable/windowsservercore1909/meta.json
+++ b/release/stable/windowsservercore1909/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-05-11",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/windowsservercore2004/meta.json b/release/stable/windowsservercore2004/meta.json
index 504d74601..41ebc755d 100644
--- a/release/stable/windowsservercore2004/meta.json
+++ b/release/stable/windowsservercore2004/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2021-12-14",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/windowsservercore2022/meta.json b/release/stable/windowsservercore2022/meta.json
index 71998ce09..1a97e0576 100644
--- a/release/stable/windowsservercore2022/meta.json
+++ b/release/stable/windowsservercore2022/meta.json
@@ -18,5 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": true
+    "UseAcr": true,
+    "EndOfLife": "2024-11-30",
+    "DistributionState": "Validated"
 }
diff --git a/release/stable/windowsservercore20H2/meta.json b/release/stable/windowsservercore20H2/meta.json
index b78fbb521..3f08b5e8d 100644
--- a/release/stable/windowsservercore20H2/meta.json
+++ b/release/stable/windowsservercore20H2/meta.json
@@ -16,4 +16,6 @@
         "size": 1
     },
     "UseAcr": true,
+    "EndOfLife": "2022-05-10",
+    "DistributionState": "Validated"
 }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 24ee62fa2..4fe17b827 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -9,6 +9,16 @@ $repoRoot = Join-Path -path $parent -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
+$repoMetaData = $null
+function Get-RepoMetaData {
+    if (!$script:repoMetaData) {
+        Write-Verbose "getting metadata from repo" -Verbose
+        $script:repoMetaData = Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json'
+    }
+
+    return $script:repoMetaData
+}
+
 function Get-PowerShellVersion
 {
     [CmdletBinding(DefaultParameterSetName='Default')]
@@ -45,7 +55,7 @@ function Get-PowerShellVersion
     )
 
     if ($PSCmdlet.ParameterSetName -notlike 'ExplicitVersion*') {
-        $metaData = Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json'
+        $metaData = Get-RepoMetaData
 
         $releaseTag = if ($Preview.IsPresent) {
             $metaData.PreviewReleaseTag
@@ -119,6 +129,13 @@ function Get-ImageList
     }
 }
 
+enum DistributionState {
+    Unknown
+    Validating
+    Validated
+    EndOfLife
+}
+
 class DockerImageMetaData {
     [Bool]
     $IsLinux = $false
@@ -191,6 +208,20 @@ class DockerImageMetaData {
 
     [bool]
     $IsPrivate = $false
+
+    [datetime]
+    $EndOfLife = (Get-Date).AddDays(7)
+
+    [DistributionState]
+    $DistributionState =[DistributionState]::Unknown
+
+    [DistributionState] GetDistributionState() {
+        if ($this.EndOfLife -lt (Get-Date)) {
+            return [DistributionState]::EndOfLife
+        }
+
+        return $this.DistributionState
+    }
 }
 
 class ShortTagMetaData {
@@ -834,3 +865,31 @@ function New-SasData
         SasQuery = $sasQuery
     }
 }
+
+function Invoke-PesterWrapper {
+    param(
+        [string]
+        $Script,
+
+        [string]
+        $OutputFile,
+
+        [hashtable]
+        $ExtraParams
+    )
+
+    Write-Verbose "Launching pester with $($ExtraParams|Out-String)" -Verbose
+
+    if(!(Get-Module -ListAvailable pester -ErrorAction Ignore) -or $ForcePesterInstall.IsPresent)
+    {
+        Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
+    }
+
+    Write-Verbose -Message "logging to $OutputFile" -Verbose
+    $results = $null
+    $results = Invoke-Pester -Script $Script -OutputFile $OutputFile -PassThru -OutputFormat NUnitXml @extraParams
+    if(!$results -or $results.FailedCount -gt 0 -or !$results.TotalCount)
+    {
+        throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount) Total: $($results.TotalCount)"
+    }
+}

From b47a0b63110993c09c6e327d929f44ea29dbf5ae Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Apr 2022 12:54:48 -0700
Subject: [PATCH 183/354] Remove EOL images (#630)

---
 release/lts/centos7/docker/Dockerfile         | 54 -----------
 release/lts/centos7/meta.json                 | 18 ----
 .../lts/centos7/test-deps/docker/Dockerfile   | 18 ----
 release/lts/centos7/test-deps/meta.json       | 15 ----
 release/lts/nanoserver1909/docker/Dockerfile  | 89 ------------------
 release/lts/nanoserver1909/meta.json          | 23 -----
 release/lts/nanoserver2004/docker/Dockerfile  | 89 ------------------
 release/lts/nanoserver2004/meta.json          | 23 -----
 .../windowsservercore1909/docker/Dockerfile   | 67 --------------
 release/lts/windowsservercore1909/meta.json   | 23 -----
 .../windowsservercore2004/docker/Dockerfile   | 67 --------------
 release/lts/windowsservercore2004/meta.json   | 23 -----
 release/preview/centos7/docker/Dockerfile     | 57 ------------
 release/preview/centos7/meta.json             | 18 ----
 .../centos7/test-deps/docker/Dockerfile       | 18 ----
 release/preview/centos7/test-deps/meta.json   | 15 ----
 .../preview/nanoserver1909/docker/Dockerfile  | 87 ------------------
 release/preview/nanoserver1909/meta.json      | 20 -----
 .../preview/nanoserver2004/docker/Dockerfile  | 87 ------------------
 release/preview/nanoserver2004/meta.json      | 20 -----
 .../windowsservercore1909/docker/Dockerfile   | 67 --------------
 .../preview/windowsservercore1909/meta.json   | 23 -----
 .../windowsservercore2004/docker/Dockerfile   | 67 --------------
 .../preview/windowsservercore2004/meta.json   | 23 -----
 release/stable/centos7/docker/Dockerfile      | 56 ------------
 release/stable/centos7/meta.json              | 19 ----
 .../centos7/test-deps/docker/Dockerfile       | 18 ----
 release/stable/centos7/test-deps/meta.json    | 15 ----
 .../stable/nanoserver1909/docker/Dockerfile   | 90 -------------------
 release/stable/nanoserver1909/meta.json       | 24 -----
 .../stable/nanoserver2004/docker/Dockerfile   | 90 -------------------
 release/stable/nanoserver2004/meta.json       | 24 -----
 .../windowsservercore1909/docker/Dockerfile   | 70 ---------------
 .../stable/windowsservercore1909/meta.json    | 24 -----
 .../windowsservercore2004/docker/Dockerfile   | 70 ---------------
 .../stable/windowsservercore2004/meta.json    | 24 -----
 36 files changed, 1535 deletions(-)
 delete mode 100644 release/lts/centos7/docker/Dockerfile
 delete mode 100644 release/lts/centos7/meta.json
 delete mode 100644 release/lts/centos7/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/centos7/test-deps/meta.json
 delete mode 100644 release/lts/nanoserver1909/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver1909/meta.json
 delete mode 100644 release/lts/nanoserver2004/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver2004/meta.json
 delete mode 100644 release/lts/windowsservercore1909/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore1909/meta.json
 delete mode 100644 release/lts/windowsservercore2004/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore2004/meta.json
 delete mode 100644 release/preview/centos7/docker/Dockerfile
 delete mode 100644 release/preview/centos7/meta.json
 delete mode 100644 release/preview/centos7/test-deps/docker/Dockerfile
 delete mode 100644 release/preview/centos7/test-deps/meta.json
 delete mode 100644 release/preview/nanoserver1909/docker/Dockerfile
 delete mode 100644 release/preview/nanoserver1909/meta.json
 delete mode 100644 release/preview/nanoserver2004/docker/Dockerfile
 delete mode 100644 release/preview/nanoserver2004/meta.json
 delete mode 100644 release/preview/windowsservercore1909/docker/Dockerfile
 delete mode 100644 release/preview/windowsservercore1909/meta.json
 delete mode 100644 release/preview/windowsservercore2004/docker/Dockerfile
 delete mode 100644 release/preview/windowsservercore2004/meta.json
 delete mode 100644 release/stable/centos7/docker/Dockerfile
 delete mode 100644 release/stable/centos7/meta.json
 delete mode 100644 release/stable/centos7/test-deps/docker/Dockerfile
 delete mode 100644 release/stable/centos7/test-deps/meta.json
 delete mode 100644 release/stable/nanoserver1909/docker/Dockerfile
 delete mode 100644 release/stable/nanoserver1909/meta.json
 delete mode 100644 release/stable/nanoserver2004/docker/Dockerfile
 delete mode 100644 release/stable/nanoserver2004/meta.json
 delete mode 100644 release/stable/windowsservercore1909/docker/Dockerfile
 delete mode 100644 release/stable/windowsservercore1909/meta.json
 delete mode 100644 release/stable/windowsservercore2004/docker/Dockerfile
 delete mode 100644 release/stable/windowsservercore2004/meta.json

diff --git a/release/lts/centos7/docker/Dockerfile b/release/lts/centos7/docker/Dockerfile
deleted file mode 100644
index 07bc762f3..000000000
--- a/release/lts/centos7/docker/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:7 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/centos7/meta.json b/release/lts/centos7/meta.json
deleted file mode 100644
index 7ba036a1a..000000000
--- a/release/lts/centos7/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "lts-centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "7"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 585
-    },
-    "EndOfLife": "2020-08-06",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/centos7/test-deps/docker/Dockerfile b/release/lts/centos7/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/lts/centos7/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/centos7/test-deps/meta.json b/release/lts/centos7/test-deps/meta.json
deleted file mode 100644
index 141cac396..000000000
--- a/release/lts/centos7/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "lts-centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 610
-    }
-}
diff --git a/release/lts/nanoserver1909/docker/Dockerfile b/release/lts/nanoserver1909/docker/Dockerfile
deleted file mode 100644
index 1cdbf2f4a..000000000
--- a/release/lts/nanoserver1909/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1909
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1909/meta.json b/release/lts/nanoserver1909/meta.json
deleted file mode 100644
index 39c88dca5..000000000
--- a/release/lts/nanoserver1909/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver-lts"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/nanoserver2004/docker/Dockerfile b/release/lts/nanoserver2004/docker/Dockerfile
deleted file mode 100644
index 69290eabb..000000000
--- a/release/lts/nanoserver2004/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:2004
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver2004/meta.json b/release/lts/nanoserver2004/meta.json
deleted file mode 100644
index e75bef35c..000000000
--- a/release/lts/nanoserver2004/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#",
-    ],
-    "manifestLists": [
-        "nanoserver-lts"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/windowsservercore1909/docker/Dockerfile b/release/lts/windowsservercore1909/docker/Dockerfile
deleted file mode 100644
index c1c2d033f..000000000
--- a/release/lts/windowsservercore1909/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1909 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore1909/meta.json b/release/lts/windowsservercore1909/meta.json
deleted file mode 100644
index b74c6549f..000000000
--- a/release/lts/windowsservercore1909/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "lts"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/windowsservercore2004/docker/Dockerfile b/release/lts/windowsservercore2004/docker/Dockerfile
deleted file mode 100644
index 2964e2fb0..000000000
--- a/release/lts/windowsservercore2004/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:2004 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore2004/meta.json b/release/lts/windowsservercore2004/meta.json
deleted file mode 100644
index 66821a4de..000000000
--- a/release/lts/windowsservercore2004/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "lts"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}
diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile
deleted file mode 100644
index 347cd51c8..000000000
--- a/release/preview/centos7/docker/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:7 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PACKAGE_VERSION=7.0.0_preview.1
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
deleted file mode 100644
index f1f75cc1c..000000000
--- a/release/preview/centos7/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "preview-centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "7"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 586
-    },
-    "EndOfLife": "2020-08-06",
-    "DistributionState": "Validated"
-}
diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/preview/centos7/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/preview/centos7/test-deps/meta.json b/release/preview/centos7/test-deps/meta.json
deleted file mode 100644
index 6b561df29..000000000
--- a/release/preview/centos7/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "preview-centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 611
-    }
-}
diff --git a/release/preview/nanoserver1909/docker/Dockerfile b/release/preview/nanoserver1909/docker/Dockerfile
deleted file mode 100644
index 870e0cf8b..000000000
--- a/release/preview/nanoserver1909/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver1909/meta.json b/release/preview/nanoserver1909/meta.json
deleted file mode 100644
index 3b378616d..000000000
--- a/release/preview/nanoserver1909/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "tagTemplates": [
-        "preview-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/preview/nanoserver2004/docker/Dockerfile b/release/preview/nanoserver2004/docker/Dockerfile
deleted file mode 100644
index 1badb0d78..000000000
--- a/release/preview/nanoserver2004/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/nanoserver2004/meta.json b/release/preview/nanoserver2004/meta.json
deleted file mode 100644
index 45b84e532..000000000
--- a/release/preview/nanoserver2004/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "tagTemplates": [
-        "preview-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}
diff --git a/release/preview/windowsservercore1909/docker/Dockerfile b/release/preview/windowsservercore1909/docker/Dockerfile
deleted file mode 100644
index 11d4dd9ce..000000000
--- a/release/preview/windowsservercore1909/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1909 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore1909/meta.json b/release/preview/windowsservercore1909/meta.json
deleted file mode 100644
index ee1cf19c6..000000000
--- a/release/preview/windowsservercore1909/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "preview-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "preview"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/preview/windowsservercore2004/docker/Dockerfile b/release/preview/windowsservercore2004/docker/Dockerfile
deleted file mode 100644
index 464c526aa..000000000
--- a/release/preview/windowsservercore2004/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:2004 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/preview/windowsservercore2004/meta.json b/release/preview/windowsservercore2004/meta.json
deleted file mode 100644
index 18eca72a6..000000000
--- a/release/preview/windowsservercore2004/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "preview-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "preview"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}
diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile
deleted file mode 100644
index 429c4feee..000000000
--- a/release/stable/centos7/docker/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:7 AS installer-env
-
-ARG PS_VERSION=7.2.0
-ARG PACKAGE_VERSION=7.2.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # clear is part of ncurses which is used by clear
-      ncurses \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
deleted file mode 100644
index c563a0944..000000000
--- a/release/stable/centos7/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "#psversion#-centos-#shorttag#",
-        "centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "7"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 577
-    },
-    "EndOfLife": "2020-08-06",
-    "DistributionState": "Validated"
-}
diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/stable/centos7/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/stable/centos7/test-deps/meta.json b/release/stable/centos7/test-deps/meta.json
deleted file mode 100644
index 2f999f04b..000000000
--- a/release/stable/centos7/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 605
-    }
-}
diff --git a/release/stable/nanoserver1909/docker/Dockerfile b/release/stable/nanoserver1909/docker/Dockerfile
deleted file mode 100644
index f46e57210..000000000
--- a/release/stable/nanoserver1909/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver1909/meta.json b/release/stable/nanoserver1909/meta.json
deleted file mode 100644
index 1d9be915f..000000000
--- a/release/stable/nanoserver1909/meta.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/stable/nanoserver2004/docker/Dockerfile b/release/stable/nanoserver2004/docker/Dockerfile
deleted file mode 100644
index e352e8f24..000000000
--- a/release/stable/nanoserver2004/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/nanoserver2004/meta.json b/release/stable/nanoserver2004/meta.json
deleted file mode 100644
index e835e2375..000000000
--- a/release/stable/nanoserver2004/meta.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}
diff --git a/release/stable/windowsservercore1909/docker/Dockerfile b/release/stable/windowsservercore1909/docker/Dockerfile
deleted file mode 100644
index 354b9c209..000000000
--- a/release/stable/windowsservercore1909/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1909 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore1909/meta.json b/release/stable/windowsservercore1909/meta.json
deleted file mode 100644
index 5aebfc09a..000000000
--- a/release/stable/windowsservercore1909/meta.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-05-11",
-    "DistributionState": "Validated"
-}
diff --git a/release/stable/windowsservercore2004/docker/Dockerfile b/release/stable/windowsservercore2004/docker/Dockerfile
deleted file mode 100644
index 9c4a2f26a..000000000
--- a/release/stable/windowsservercore2004/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:2004 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/stable/windowsservercore2004/meta.json b/release/stable/windowsservercore2004/meta.json
deleted file mode 100644
index 41ebc755d..000000000
--- a/release/stable/windowsservercore2004/meta.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2021-12-14",
-    "DistributionState": "Validated"
-}

From e48e655116460578baf34902e6364b991d43d0cf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Apr 2022 10:42:42 -0700
Subject: [PATCH 184/354] Add channel mapping (#631)

---
 .github/dependabot.yml                        |  25 +---
 .../build-ps1-unittests/buildUnitTests.yml    |  55 ++++++++
 build.ps1                                     |  96 ++++++++-----
 .../alpine313/docker/Dockerfile               |   0
 release/{stable => 7-2}/alpine313/meta.json   |   0
 .../alpine313/test-deps/docker/Dockerfile     |   0
 .../alpine313/test-deps/meta.json             |   0
 .../alpine314/docker/Dockerfile               |   0
 release/{stable => 7-2}/alpine314/meta.json   |   0
 .../alpine314/test-deps/docker/Dockerfile     |   0
 .../alpine314/test-deps/meta.json             |   0
 .../{stable => 7-2}/arm32v7/docker/Dockerfile |   0
 release/{stable => 7-2}/arm32v7/meta.json     |   0
 .../debian10/docker/Dockerfile                |   0
 release/{stable => 7-2}/debian10/meta.json    |   0
 .../debian10/test-deps/docker/Dockerfile      |   0
 .../debian10/test-deps/meta.json              |   0
 .../debian11/docker/Dockerfile                |   0
 release/{stable => 7-2}/debian11/meta.json    |   0
 .../debian11/test-deps/docker/Dockerfile      |   0
 .../debian11/test-deps/meta.json              |   0
 .../{stable => 7-2}/debian9/docker/Dockerfile |   0
 release/{stable => 7-2}/debian9/meta.json     |   2 +-
 .../debian9/test-deps/docker/Dockerfile       |   0
 .../debian9/test-deps/meta.json               |   0
 .../fedora34/docker/Dockerfile                |   0
 release/{stable => 7-2}/fedora34/meta.json    |   2 +-
 .../fedora34/test-deps/docker/Dockerfile      |   0
 .../fedora34/test-deps/meta.json              |   0
 .../nanoserver1809/docker/Dockerfile          |   0
 .../{stable => 7-2}/nanoserver1809/meta.json  |   0
 .../nanoserver2022/docker/Dockerfile          |   0
 .../{stable => 7-2}/nanoserver2022/meta.json  |   0
 .../nanoserver20H2/docker/Dockerfile          |   0
 .../{stable => 7-2}/nanoserver20H2/meta.json  |   0
 .../{stable => 7-2}/ubi84/docker/Dockerfile   |   7 +-
 release/{stable => 7-2}/ubi84/meta.json       |   2 +-
 .../ubi84/test-deps/docker/Dockerfile         |   0
 .../{stable => 7-2}/ubi84/test-deps/meta.json |   0
 .../ubuntu16.04/docker/Dockerfile             |   0
 release/{stable => 7-2}/ubuntu16.04/meta.json |   2 +-
 .../ubuntu16.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu16.04/test-deps/meta.json           |   0
 .../ubuntu18.04/docker/Dockerfile             |   0
 release/{stable => 7-2}/ubuntu18.04/meta.json |   2 +-
 .../ubuntu18.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu18.04/test-deps/meta.json           |   0
 .../ubuntu20.04/docker/Dockerfile             |   0
 release/{stable => 7-2}/ubuntu20.04/meta.json |   0
 .../ubuntu20.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu20.04/test-deps/meta.json           |   0
 .../windowsserver2022/docker/Dockerfile       |   0
 .../windowsserver2022/meta.json               |   0
 .../windowsservercore2022/docker/Dockerfile   |   0
 .../windowsservercore2022/meta.json           |   0
 .../windowsservercore20H2/docker/Dockerfile   |   0
 .../windowsservercore20H2/meta.json           |   0
 .../alpine312/docker/Dockerfile               |   0
 release/{preview => 7-3}/alpine312/meta.json  |   0
 .../alpine312/test-deps/docker/Dockerfile     |   0
 .../alpine312/test-deps/meta.json             |   0
 .../alpine313/docker/Dockerfile               |   0
 release/{preview => 7-3}/alpine313/meta.json  |   0
 .../alpine313/test-deps/docker/Dockerfile     |   0
 .../alpine313/test-deps/meta.json             |   0
 .../alpine314/docker/Dockerfile               |   0
 release/{preview => 7-3}/alpine314/meta.json  |   0
 .../alpine314/test-deps/docker/Dockerfile     |   0
 .../alpine314/test-deps/meta.json             |   0
 .../arm32v7/docker/Dockerfile                 |   0
 release/{preview => 7-3}/arm32v7/meta.json    |   0
 .../debian10/docker/Dockerfile                |   0
 release/{preview => 7-3}/debian10/meta.json   |   0
 .../debian10/test-deps/docker/Dockerfile      |   0
 .../debian10/test-deps/meta.json              |   0
 .../debian11/docker/Dockerfile                |   0
 release/{preview => 7-3}/debian11/meta.json   |   0
 .../debian11/test-deps/docker/Dockerfile      |   0
 .../debian11/test-deps/meta.json              |   0
 .../debian9/docker/Dockerfile                 |   0
 release/{preview => 7-3}/debian9/meta.json    |   0
 .../debian9/test-deps/docker/Dockerfile       |   0
 .../debian9/test-deps/meta.json               |   0
 .../fedora34/docker/Dockerfile                |   0
 release/{preview => 7-3}/fedora34/meta.json   |   2 +-
 .../fedora34/test-deps/docker/Dockerfile      |   0
 .../fedora34/test-deps/meta.json              |   0
 .../mariner1/docker/Dockerfile                |   0
 release/{preview => 7-3}/mariner1/meta.json   |   0
 .../mariner1/test-deps/docker/Dockerfile      |   0
 .../mariner1/test-deps/meta.json              |   0
 .../nanoserver1809/docker/Dockerfile          |   0
 .../{preview => 7-3}/nanoserver1809/meta.json |   0
 .../nanoserver2022/docker/Dockerfile          |   0
 .../{preview => 7-3}/nanoserver2022/meta.json |   0
 .../nanoserver20H2/docker/Dockerfile          |   0
 .../{preview => 7-3}/nanoserver20H2/meta.json |   0
 .../{preview => 7-3}/ubi84/docker/Dockerfile  |   8 +-
 release/{preview => 7-3}/ubi84/meta.json      |   2 +-
 .../ubi84/test-deps/docker/Dockerfile         |   0
 .../ubi84/test-deps/meta.json                 |   0
 .../ubuntu16.04/docker/Dockerfile             |   0
 .../{preview => 7-3}/ubuntu16.04/meta.json    |   2 +-
 .../ubuntu16.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu16.04/test-deps/meta.json           |   0
 .../ubuntu18.04/docker/Dockerfile             |   0
 .../{preview => 7-3}/ubuntu18.04/meta.json    |   2 +-
 .../ubuntu18.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu18.04/test-deps/meta.json           |   0
 .../ubuntu20.04/docker/Dockerfile             |   0
 .../{preview => 7-3}/ubuntu20.04/meta.json    |   0
 .../ubuntu20.04/test-deps/docker/Dockerfile   |   0
 .../ubuntu20.04/test-deps/meta.json           |   0
 .../windowsserver2022/docker/Dockerfile       |   0
 .../windowsserver2022/meta.json               |   0
 .../windowsservercore2022/docker/Dockerfile   |   0
 .../windowsservercore2022/meta.json           |   0
 .../windowsservercore20H2/docker/Dockerfile   |   0
 .../windowsservercore20H2/meta.json           |   0
 release/servicing/centos7/meta.json           |   2 +-
 release/servicing/debian9/meta.json           |   2 +-
 release/servicing/ubuntu16.04/meta.json       |   2 +-
 release/servicing/ubuntu18.04/meta.json       |   2 +-
 tests/container.tests.ps1                     |  22 +--
 tools/buildHelper/buildHelper.psm1            | 133 ++++++++++++------
 tools/buildHelper/channels.json               |  27 ++++
 unittests/build.tests.ps1                     |  29 ++++
 unittests/checkForDuplicateTags.tests.ps1     |  15 ++
 unittests/generateManifestLists.tests.ps1     |  16 +++
 unittests/generateMatrixJson.tests.ps1        | 120 ++++++++++++++++
 unittests/generateTagsYaml.tests.ps1          |  15 ++
 unittests/getTags.tests.ps1                   |  26 ++++
 unittests/test.tests.ps1                      |  30 ++++
 133 files changed, 502 insertions(+), 148 deletions(-)
 create mode 100644 .vsts-ci/build-ps1-unittests/buildUnitTests.yml
 rename release/{stable => 7-2}/alpine313/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/alpine313/meta.json (100%)
 rename release/{preview => 7-2}/alpine313/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/alpine313/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/alpine314/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/alpine314/meta.json (100%)
 rename release/{preview => 7-2}/alpine314/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/alpine314/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/arm32v7/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/arm32v7/meta.json (100%)
 rename release/{stable => 7-2}/debian10/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian10/meta.json (100%)
 rename release/{stable => 7-2}/debian10/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian10/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/debian11/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian11/meta.json (100%)
 rename release/{stable => 7-2}/debian11/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian11/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/debian9/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian9/meta.json (85%)
 rename release/{preview => 7-2}/debian9/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/debian9/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/fedora34/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/fedora34/meta.json (83%)
 rename release/{stable => 7-2}/fedora34/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/fedora34/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/nanoserver1809/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/nanoserver1809/meta.json (100%)
 rename release/{preview => 7-2}/nanoserver2022/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/nanoserver2022/meta.json (100%)
 rename release/{stable => 7-2}/nanoserver20H2/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/nanoserver20H2/meta.json (100%)
 rename release/{stable => 7-2}/ubi84/docker/Dockerfile (90%)
 rename release/{stable => 7-2}/ubi84/meta.json (85%)
 rename release/{preview => 7-2}/ubi84/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubi84/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/ubuntu16.04/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu16.04/meta.json (85%)
 rename release/{stable => 7-2}/ubuntu16.04/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu16.04/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/ubuntu18.04/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu18.04/meta.json (85%)
 rename release/{preview => 7-2}/ubuntu18.04/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu18.04/test-deps/meta.json (100%)
 rename release/{stable => 7-2}/ubuntu20.04/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu20.04/meta.json (100%)
 rename release/{preview => 7-2}/ubuntu20.04/test-deps/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/ubuntu20.04/test-deps/meta.json (100%)
 rename release/{preview => 7-2}/windowsserver2022/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/windowsserver2022/meta.json (100%)
 rename release/{preview => 7-2}/windowsservercore2022/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/windowsservercore2022/meta.json (100%)
 rename release/{stable => 7-2}/windowsservercore20H2/docker/Dockerfile (100%)
 rename release/{stable => 7-2}/windowsservercore20H2/meta.json (100%)
 rename release/{preview => 7-3}/alpine312/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine312/meta.json (100%)
 rename release/{preview => 7-3}/alpine312/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine312/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/alpine313/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine313/meta.json (100%)
 rename release/{stable => 7-3}/alpine313/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine313/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/alpine314/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine314/meta.json (100%)
 rename release/{stable => 7-3}/alpine314/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/alpine314/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/arm32v7/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/arm32v7/meta.json (100%)
 rename release/{preview => 7-3}/debian10/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian10/meta.json (100%)
 rename release/{preview => 7-3}/debian10/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian10/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/debian11/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian11/meta.json (100%)
 rename release/{preview => 7-3}/debian11/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian11/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/debian9/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian9/meta.json (100%)
 rename release/{stable => 7-3}/debian9/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/debian9/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/fedora34/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/fedora34/meta.json (86%)
 rename release/{preview => 7-3}/fedora34/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/fedora34/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/mariner1/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/mariner1/meta.json (100%)
 rename release/{preview => 7-3}/mariner1/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/mariner1/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/nanoserver1809/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/nanoserver1809/meta.json (100%)
 rename release/{stable => 7-3}/nanoserver2022/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/nanoserver2022/meta.json (100%)
 rename release/{preview => 7-3}/nanoserver20H2/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/nanoserver20H2/meta.json (100%)
 rename release/{preview => 7-3}/ubi84/docker/Dockerfile (91%)
 rename release/{preview => 7-3}/ubi84/meta.json (87%)
 rename release/{stable => 7-3}/ubi84/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubi84/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/ubuntu16.04/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu16.04/meta.json (86%)
 rename release/{preview => 7-3}/ubuntu16.04/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu16.04/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/ubuntu18.04/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu18.04/meta.json (86%)
 rename release/{stable => 7-3}/ubuntu18.04/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu18.04/test-deps/meta.json (100%)
 rename release/{preview => 7-3}/ubuntu20.04/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu20.04/meta.json (100%)
 rename release/{stable => 7-3}/ubuntu20.04/test-deps/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/ubuntu20.04/test-deps/meta.json (100%)
 rename release/{stable => 7-3}/windowsserver2022/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/windowsserver2022/meta.json (100%)
 rename release/{stable => 7-3}/windowsservercore2022/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/windowsservercore2022/meta.json (100%)
 rename release/{preview => 7-3}/windowsservercore20H2/docker/Dockerfile (100%)
 rename release/{preview => 7-3}/windowsservercore20H2/meta.json (100%)
 create mode 100644 tools/buildHelper/channels.json
 create mode 100644 unittests/build.tests.ps1
 create mode 100644 unittests/checkForDuplicateTags.tests.ps1
 create mode 100644 unittests/generateManifestLists.tests.ps1
 create mode 100644 unittests/generateMatrixJson.tests.ps1
 create mode 100644 unittests/generateTagsYaml.tests.ps1
 create mode 100644 unittests/getTags.tests.ps1
 create mode 100644 unittests/test.tests.ps1

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d1c26437a..e9c29b21a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,42 +3,27 @@ version: 2
 # update_schedule: live is not supported by docker
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/alpine314/docker"
+    directory: "/release/7-3/alpine314/docker"
     schedule:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/centos8/dependabot"
+    directory: "/release/7-3/centos8/dependabot"
     schedule:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/debian10/dependabot"
+    directory: "/release/7-3/debian11/dependabot"
     schedule:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/debian11/dependabot"
+    directory: "/release/7-3/nanoserver20H2/dependabot"
     schedule:
       interval: "weekly"
 
   - package-ecosystem: "docker"
-    directory: "/release/preview/fedora/docker"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/preview/nanoserver20H2/dependabot"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/preview/ubuntu20.04/docker"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/preview/windowsservercore/dependabot"
+    directory: "/release/7-3/ubuntu20.04/docker"
     schedule:
       interval: "weekly"
 
diff --git a/.vsts-ci/build-ps1-unittests/buildUnitTests.yml b/.vsts-ci/build-ps1-unittests/buildUnitTests.yml
new file mode 100644
index 000000000..d4fffef9d
--- /dev/null
+++ b/.vsts-ci/build-ps1-unittests/buildUnitTests.yml
@@ -0,0 +1,55 @@
+name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
+
+pr:
+  branches:
+    include:
+    - master
+    - release*
+    - feature*
+  paths:
+    include:
+    - build.ps1
+    - tools/buildHelper/*
+
+resources:
+- repo: self
+  clean: true
+
+variables:
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+stages:
+  - stage: buildUnitTests
+    displayName: Build Unit Tests
+    dependsOn: []
+    jobs:
+    - job: buildUnitTests
+      pool:
+        vmImage: ubuntu-latest
+      displayName: Build Unit Tests
+      steps:
+      - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+        displayName: Set Build Name for Non-PR
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+      - pwsh: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
+        displayName: 'Install Pester'
+        condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+      - pwsh: |
+          $OutputFile = "$PWD/build-unit-tests.xml"
+          $results = $null
+          $results = Invoke-Pester -Script ./unittests/ -OutputFile $OutputFile -PassThru -OutputFormat NUnitXml
+          Write-Host "##vso[artifact.upload containerfolder=testResults;artifactname=testResults]$OutputFile"
+          if(!$results -or $results.FailedCount -gt 0 -or !$results.TotalCount)
+          {
+              throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount) Total: $($results.TotalCount)"
+          }
+        displayName: Run Build Unit Tests
+        condition: succeededOrFailed()
+      - task: PublishTestResults@2
+        displayName: 'Publish Test Results **/*tests.xml'
+        inputs:
+          testResultsFormat: NUnit
+          testResultsFiles: '**/*tests.xml'
+          testRunTitle: 'Build Unit Tests'
+        continueOnError: true
+        condition: succeededOrFailed()
diff --git a/build.ps1 b/build.ps1
index 931408813..89ca8aa22 100755
--- a/build.ps1
+++ b/build.ps1
@@ -62,17 +62,17 @@ param(
     $SkipTest,
 
     [Parameter(Mandatory, ParameterSetName="GetTagsByName")]
-    [Parameter(Mandatory, ParameterSetName="GetTagsAll")]
+    [Parameter(Mandatory, ParameterSetName="GetTagsByChannel")]
     [switch]
     $GetTags,
 
-    [Parameter(Mandatory, ParameterSetName="DupeCheckAll")]
+    [Parameter(Mandatory, ParameterSetName="DupeCheck")]
     [switch]
     $CheckForDuplicateTags,
 
     [Parameter(Mandatory, ParameterSetName="TestAll")]
     [Parameter(Mandatory, ParameterSetName="localBuildAll")]
-    [Parameter(Mandatory, ParameterSetName="GetTagsAll")]
+    [Parameter(Mandatory, ParameterSetName="GetTagsByChannel")]
     [switch]
     $All,
 
@@ -91,20 +91,6 @@ param(
     [string]
     $TagFilter,
 
-    [ValidateSet('stable','preview','servicing','community-stable','community-preview','community-servicing','lts')]
-    [Parameter(Mandatory, ParameterSetName="TestByName")]
-    [Parameter(Mandatory, ParameterSetName="TestAll")]
-    [Parameter(ParameterSetName="localBuildByName")]
-    [Parameter(Mandatory, ParameterSetName="localBuildAll")]
-    [Parameter(Mandatory, ParameterSetName="GetTagsByName")]
-    [Parameter(Mandatory, ParameterSetName="GetTagsAll")]
-    [Parameter(Mandatory, ParameterSetName="DupeCheckAll")]
-    [Parameter(Mandatory, ParameterSetName="GenerateTagsYaml")]
-    [Parameter(Mandatory, ParameterSetName="GenerateMatrixJson")]
-    [Parameter(Mandatory, ParameterSetName="GenerateManifestLists")]
-    [string[]]
-    $Channel='stable',
-
     [Parameter(ParameterSetName="localBuildByName")]
     [Parameter(ParameterSetName="localBuildAll")]
     [ValidateScript({([uri]$_).Scheme -eq 'https'})]
@@ -116,7 +102,7 @@ param(
     [Parameter(Mandatory, ParameterSetName="TestByName")]
     [Parameter(Mandatory, ParameterSetName="TestAll")]
     [Parameter(Mandatory, ParameterSetName="GetTagsByName")]
-    [Parameter(Mandatory, ParameterSetName="GetTagsAll")]
+    [Parameter(Mandatory, ParameterSetName="GetTagsByChannel")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
     $Version,
@@ -178,26 +164,12 @@ DynamicParam {
     # Add a dynamic parameter '-Name' which specifies the name(s) of the images to build or test
     $buildHelperPath = Join-Path -Path $PSScriptRoot -ChildPath 'tools/buildHelper'
 
-    Import-Module $buildHelperPath -Force
-
-    # Get the names of the builds.
-    $releasePath = Join-Path -Path $PSScriptRoot -ChildPath 'release'
+    Import-Module $buildHelperPath
 
-    switch ($Channel)
-    {
-        $null {
-            $imageChannel = 'all'
-        }
-
-        default {
-            $imageChannels = $Channel
-        }
-    }
+    $imageChannel = 'all'
 
     $dockerFileNames = @()
-    foreach($imageChannel in $imageChannels){
-        Get-ImageList -Channel $imageChannel | ForEach-Object { $dockerFileNames += $_ }
-    }
+    Get-ImageList -Channel $imageChannel | ForEach-Object { $dockerFileNames += $_ }
 
     # Create the parameter attributs
     $Attributes = [System.Collections.ObjectModel.Collection[System.Attribute]]::new()
@@ -219,21 +191,67 @@ DynamicParam {
     # Return parameters dictionaly
     $parameters = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
     $parameters.Add("Name", $Parameter) > $null
+
+    # Create the parameter attributs
+    $channelAttributes = [System.Collections.ObjectModel.Collection[System.Attribute]]::new()
+
+    Add-ParameterAttribute -ParameterSetName 'TestAll' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'TestByName' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'localBuildAll' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'localBuildByName' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'GetTagsByName' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'GetTagsByChannel' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'DupeCheck' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'GenerateMatrixJson' -Attributes $channelAttributes -Mandatory $false
+    Add-ParameterAttribute -ParameterSetName 'GenerateTagsYaml' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'GenerateManifestLists' -Attributes $channelAttributes
+
+    $channelNames = Get-ChannelNames
+    $ValidateSetAttr = [System.Management.Automation.ValidateSetAttribute]::new(([string[]]$channelNames))
+    $channelAttributes.Add($ValidateSetAttr) > $null
+
+    # Create the parameter
+    $Parameter = [System.Management.Automation.RuntimeDefinedParameter]::new("Channel", [string[]], $channelAttributes)
+    $parameters.Add("Channel", $Parameter) > $null
+
     return $parameters
 }
 
 Begin {
+    $Channel = $PSBoundParameters["Channel"]
+    if ($PSBoundParameters['Name']) {
+        $Name = $PSBoundParameters["Name"]
+    } else {
+        $Name = $null
+    }
+
     if (!$IsWindows) {
         $ENV:DOCKER_BUILDKIT = 1
     }
 
-    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheckAll', 'GenerateManifestLists' -and $Channel.Count -gt 1)
+    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
     }
 
     # We are using the Channel parameter, so assign the variable to that
-    $Channels = $Channel
+    if ($PSCmdlet.ParameterSetName -like '*All' -or ($PSCmdlet.ParameterSetName -eq 'localBuildByName' -and $Channel.Count -eq 0)) {
+        $Channels = $channelNames
+    } elseif ($FullJson) {
+        $Channels = $channelNames | Where-Object { $_ -notlike 'community*' }
+    } else {
+        $Channels = $Channel
+    }
+
+    foreach($dockerFileName in $Name) {
+        $images = (Get-ImageList -Channel $Channels)
+        if($dockerFileName -notin $images) {
+            $exception = [System.Management.Automation.ParameterBindingException]::new("Image $dockerFileName not found in channel $Channels")
+            throw $exception
+        }
+    }
+
+    Write-Verbose "Channels: $Channels"
 
     $sasData = $null
     if($SasUrl)
@@ -277,7 +295,7 @@ End {
         $linuxVersion = $versions.linuxVersion
 
         # Calculate the paths
-        $channelPath = Join-Path -Path $releasePath -ChildPath $actualChannel.ToLowerInvariant()
+        $channelPath = Get-ChannelPath -Channel $actualChannel
 
         foreach($dockerFileName in $Name)
         {
@@ -336,7 +354,7 @@ End {
                 }
             }
         }
-    }
+    } # end foreach channel
 
     foreach($allMeta in $toBuild)
     {
diff --git a/release/stable/alpine313/docker/Dockerfile b/release/7-2/alpine313/docker/Dockerfile
similarity index 100%
rename from release/stable/alpine313/docker/Dockerfile
rename to release/7-2/alpine313/docker/Dockerfile
diff --git a/release/stable/alpine313/meta.json b/release/7-2/alpine313/meta.json
similarity index 100%
rename from release/stable/alpine313/meta.json
rename to release/7-2/alpine313/meta.json
diff --git a/release/preview/alpine313/test-deps/docker/Dockerfile b/release/7-2/alpine313/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine313/test-deps/docker/Dockerfile
rename to release/7-2/alpine313/test-deps/docker/Dockerfile
diff --git a/release/stable/alpine313/test-deps/meta.json b/release/7-2/alpine313/test-deps/meta.json
similarity index 100%
rename from release/stable/alpine313/test-deps/meta.json
rename to release/7-2/alpine313/test-deps/meta.json
diff --git a/release/stable/alpine314/docker/Dockerfile b/release/7-2/alpine314/docker/Dockerfile
similarity index 100%
rename from release/stable/alpine314/docker/Dockerfile
rename to release/7-2/alpine314/docker/Dockerfile
diff --git a/release/stable/alpine314/meta.json b/release/7-2/alpine314/meta.json
similarity index 100%
rename from release/stable/alpine314/meta.json
rename to release/7-2/alpine314/meta.json
diff --git a/release/preview/alpine314/test-deps/docker/Dockerfile b/release/7-2/alpine314/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine314/test-deps/docker/Dockerfile
rename to release/7-2/alpine314/test-deps/docker/Dockerfile
diff --git a/release/stable/alpine314/test-deps/meta.json b/release/7-2/alpine314/test-deps/meta.json
similarity index 100%
rename from release/stable/alpine314/test-deps/meta.json
rename to release/7-2/alpine314/test-deps/meta.json
diff --git a/release/stable/arm32v7/docker/Dockerfile b/release/7-2/arm32v7/docker/Dockerfile
similarity index 100%
rename from release/stable/arm32v7/docker/Dockerfile
rename to release/7-2/arm32v7/docker/Dockerfile
diff --git a/release/stable/arm32v7/meta.json b/release/7-2/arm32v7/meta.json
similarity index 100%
rename from release/stable/arm32v7/meta.json
rename to release/7-2/arm32v7/meta.json
diff --git a/release/stable/debian10/docker/Dockerfile b/release/7-2/debian10/docker/Dockerfile
similarity index 100%
rename from release/stable/debian10/docker/Dockerfile
rename to release/7-2/debian10/docker/Dockerfile
diff --git a/release/stable/debian10/meta.json b/release/7-2/debian10/meta.json
similarity index 100%
rename from release/stable/debian10/meta.json
rename to release/7-2/debian10/meta.json
diff --git a/release/stable/debian10/test-deps/docker/Dockerfile b/release/7-2/debian10/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/debian10/test-deps/docker/Dockerfile
rename to release/7-2/debian10/test-deps/docker/Dockerfile
diff --git a/release/stable/debian10/test-deps/meta.json b/release/7-2/debian10/test-deps/meta.json
similarity index 100%
rename from release/stable/debian10/test-deps/meta.json
rename to release/7-2/debian10/test-deps/meta.json
diff --git a/release/stable/debian11/docker/Dockerfile b/release/7-2/debian11/docker/Dockerfile
similarity index 100%
rename from release/stable/debian11/docker/Dockerfile
rename to release/7-2/debian11/docker/Dockerfile
diff --git a/release/stable/debian11/meta.json b/release/7-2/debian11/meta.json
similarity index 100%
rename from release/stable/debian11/meta.json
rename to release/7-2/debian11/meta.json
diff --git a/release/stable/debian11/test-deps/docker/Dockerfile b/release/7-2/debian11/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/debian11/test-deps/docker/Dockerfile
rename to release/7-2/debian11/test-deps/docker/Dockerfile
diff --git a/release/stable/debian11/test-deps/meta.json b/release/7-2/debian11/test-deps/meta.json
similarity index 100%
rename from release/stable/debian11/test-deps/meta.json
rename to release/7-2/debian11/test-deps/meta.json
diff --git a/release/stable/debian9/docker/Dockerfile b/release/7-2/debian9/docker/Dockerfile
similarity index 100%
rename from release/stable/debian9/docker/Dockerfile
rename to release/7-2/debian9/docker/Dockerfile
diff --git a/release/stable/debian9/meta.json b/release/7-2/debian9/meta.json
similarity index 85%
rename from release/stable/debian9/meta.json
rename to release/7-2/debian9/meta.json
index bcb9887ae..0731f2151 100644
--- a/release/stable/debian9/meta.json
+++ b/release/7-2/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/7-2/debian9/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/debian9/test-deps/docker/Dockerfile
rename to release/7-2/debian9/test-deps/docker/Dockerfile
diff --git a/release/stable/debian9/test-deps/meta.json b/release/7-2/debian9/test-deps/meta.json
similarity index 100%
rename from release/stable/debian9/test-deps/meta.json
rename to release/7-2/debian9/test-deps/meta.json
diff --git a/release/stable/fedora34/docker/Dockerfile b/release/7-2/fedora34/docker/Dockerfile
similarity index 100%
rename from release/stable/fedora34/docker/Dockerfile
rename to release/7-2/fedora34/docker/Dockerfile
diff --git a/release/stable/fedora34/meta.json b/release/7-2/fedora34/meta.json
similarity index 83%
rename from release/stable/fedora34/meta.json
rename to release/7-2/fedora34/meta.json
index cc5e4c5c2..00d4b2b00 100644
--- a/release/stable/fedora34/meta.json
+++ b/release/7-2/fedora34/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/fedora34/test-deps/docker/Dockerfile b/release/7-2/fedora34/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/fedora34/test-deps/docker/Dockerfile
rename to release/7-2/fedora34/test-deps/docker/Dockerfile
diff --git a/release/stable/fedora34/test-deps/meta.json b/release/7-2/fedora34/test-deps/meta.json
similarity index 100%
rename from release/stable/fedora34/test-deps/meta.json
rename to release/7-2/fedora34/test-deps/meta.json
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/7-2/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/stable/nanoserver1809/docker/Dockerfile
rename to release/7-2/nanoserver1809/docker/Dockerfile
diff --git a/release/stable/nanoserver1809/meta.json b/release/7-2/nanoserver1809/meta.json
similarity index 100%
rename from release/stable/nanoserver1809/meta.json
rename to release/7-2/nanoserver1809/meta.json
diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/7-2/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/preview/nanoserver2022/docker/Dockerfile
rename to release/7-2/nanoserver2022/docker/Dockerfile
diff --git a/release/stable/nanoserver2022/meta.json b/release/7-2/nanoserver2022/meta.json
similarity index 100%
rename from release/stable/nanoserver2022/meta.json
rename to release/7-2/nanoserver2022/meta.json
diff --git a/release/stable/nanoserver20H2/docker/Dockerfile b/release/7-2/nanoserver20H2/docker/Dockerfile
similarity index 100%
rename from release/stable/nanoserver20H2/docker/Dockerfile
rename to release/7-2/nanoserver20H2/docker/Dockerfile
diff --git a/release/stable/nanoserver20H2/meta.json b/release/7-2/nanoserver20H2/meta.json
similarity index 100%
rename from release/stable/nanoserver20H2/meta.json
rename to release/7-2/nanoserver20H2/meta.json
diff --git a/release/stable/ubi84/docker/Dockerfile b/release/7-2/ubi84/docker/Dockerfile
similarity index 90%
rename from release/stable/ubi84/docker/Dockerfile
rename to release/7-2/ubi84/docker/Dockerfile
index e38c8a567..42ed265e1 100644
--- a/release/stable/ubi84/docker/Dockerfile
+++ b/release/7-2/ubi84/docker/Dockerfile
@@ -5,9 +5,7 @@ FROM registry.access.redhat.com/ubi8/ubi:8.4 AS installer-env
 ARG PS_VERSION=7.2.2
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
 # Install powershell
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
@@ -35,8 +33,7 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     && yum upgrade-minimal -y --security \
     && yum clean all
 # Define ENVs for Localization/Globalization
-ENV PS_INSTALL_VERSION=7 \
-    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
diff --git a/release/stable/ubi84/meta.json b/release/7-2/ubi84/meta.json
similarity index 85%
rename from release/stable/ubi84/meta.json
rename to release/7-2/ubi84/meta.json
index 6875730be..0c6fbf926 100644
--- a/release/stable/ubi84/meta.json
+++ b/release/7-2/ubi84/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rh.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Universal Base Image 8.4",
     "FullRepository": "powershell/rhel",
diff --git a/release/preview/ubi84/test-deps/docker/Dockerfile b/release/7-2/ubi84/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/ubi84/test-deps/docker/Dockerfile
rename to release/7-2/ubi84/test-deps/docker/Dockerfile
diff --git a/release/stable/ubi84/test-deps/meta.json b/release/7-2/ubi84/test-deps/meta.json
similarity index 100%
rename from release/stable/ubi84/test-deps/meta.json
rename to release/7-2/ubi84/test-deps/meta.json
diff --git a/release/stable/ubuntu16.04/docker/Dockerfile b/release/7-2/ubuntu16.04/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu16.04/docker/Dockerfile
rename to release/7-2/ubuntu16.04/docker/Dockerfile
diff --git a/release/stable/ubuntu16.04/meta.json b/release/7-2/ubuntu16.04/meta.json
similarity index 85%
rename from release/stable/ubuntu16.04/meta.json
rename to release/7-2/ubuntu16.04/meta.json
index ec6767b4e..3b2e2d619 100644
--- a/release/stable/ubuntu16.04/meta.json
+++ b/release/7-2/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-#shorttag#",
diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu16.04/test-deps/docker/Dockerfile
rename to release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
diff --git a/release/stable/ubuntu16.04/test-deps/meta.json b/release/7-2/ubuntu16.04/test-deps/meta.json
similarity index 100%
rename from release/stable/ubuntu16.04/test-deps/meta.json
rename to release/7-2/ubuntu16.04/test-deps/meta.json
diff --git a/release/stable/ubuntu18.04/docker/Dockerfile b/release/7-2/ubuntu18.04/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu18.04/docker/Dockerfile
rename to release/7-2/ubuntu18.04/docker/Dockerfile
diff --git a/release/stable/ubuntu18.04/meta.json b/release/7-2/ubuntu18.04/meta.json
similarity index 85%
rename from release/stable/ubuntu18.04/meta.json
rename to release/7-2/ubuntu18.04/meta.json
index e3541693c..845a73c96 100644
--- a/release/stable/ubuntu18.04/meta.json
+++ b/release/7-2/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu18.04/test-deps/docker/Dockerfile
rename to release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
diff --git a/release/stable/ubuntu18.04/test-deps/meta.json b/release/7-2/ubuntu18.04/test-deps/meta.json
similarity index 100%
rename from release/stable/ubuntu18.04/test-deps/meta.json
rename to release/7-2/ubuntu18.04/test-deps/meta.json
diff --git a/release/stable/ubuntu20.04/docker/Dockerfile b/release/7-2/ubuntu20.04/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu20.04/docker/Dockerfile
rename to release/7-2/ubuntu20.04/docker/Dockerfile
diff --git a/release/stable/ubuntu20.04/meta.json b/release/7-2/ubuntu20.04/meta.json
similarity index 100%
rename from release/stable/ubuntu20.04/meta.json
rename to release/7-2/ubuntu20.04/meta.json
diff --git a/release/preview/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu20.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu20.04/test-deps/docker/Dockerfile
rename to release/7-2/ubuntu20.04/test-deps/docker/Dockerfile
diff --git a/release/stable/ubuntu20.04/test-deps/meta.json b/release/7-2/ubuntu20.04/test-deps/meta.json
similarity index 100%
rename from release/stable/ubuntu20.04/test-deps/meta.json
rename to release/7-2/ubuntu20.04/test-deps/meta.json
diff --git a/release/preview/windowsserver2022/docker/Dockerfile b/release/7-2/windowsserver2022/docker/Dockerfile
similarity index 100%
rename from release/preview/windowsserver2022/docker/Dockerfile
rename to release/7-2/windowsserver2022/docker/Dockerfile
diff --git a/release/stable/windowsserver2022/meta.json b/release/7-2/windowsserver2022/meta.json
similarity index 100%
rename from release/stable/windowsserver2022/meta.json
rename to release/7-2/windowsserver2022/meta.json
diff --git a/release/preview/windowsservercore2022/docker/Dockerfile b/release/7-2/windowsservercore2022/docker/Dockerfile
similarity index 100%
rename from release/preview/windowsservercore2022/docker/Dockerfile
rename to release/7-2/windowsservercore2022/docker/Dockerfile
diff --git a/release/stable/windowsservercore2022/meta.json b/release/7-2/windowsservercore2022/meta.json
similarity index 100%
rename from release/stable/windowsservercore2022/meta.json
rename to release/7-2/windowsservercore2022/meta.json
diff --git a/release/stable/windowsservercore20H2/docker/Dockerfile b/release/7-2/windowsservercore20H2/docker/Dockerfile
similarity index 100%
rename from release/stable/windowsservercore20H2/docker/Dockerfile
rename to release/7-2/windowsservercore20H2/docker/Dockerfile
diff --git a/release/stable/windowsservercore20H2/meta.json b/release/7-2/windowsservercore20H2/meta.json
similarity index 100%
rename from release/stable/windowsservercore20H2/meta.json
rename to release/7-2/windowsservercore20H2/meta.json
diff --git a/release/preview/alpine312/docker/Dockerfile b/release/7-3/alpine312/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine312/docker/Dockerfile
rename to release/7-3/alpine312/docker/Dockerfile
diff --git a/release/preview/alpine312/meta.json b/release/7-3/alpine312/meta.json
similarity index 100%
rename from release/preview/alpine312/meta.json
rename to release/7-3/alpine312/meta.json
diff --git a/release/preview/alpine312/test-deps/docker/Dockerfile b/release/7-3/alpine312/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine312/test-deps/docker/Dockerfile
rename to release/7-3/alpine312/test-deps/docker/Dockerfile
diff --git a/release/preview/alpine312/test-deps/meta.json b/release/7-3/alpine312/test-deps/meta.json
similarity index 100%
rename from release/preview/alpine312/test-deps/meta.json
rename to release/7-3/alpine312/test-deps/meta.json
diff --git a/release/preview/alpine313/docker/Dockerfile b/release/7-3/alpine313/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine313/docker/Dockerfile
rename to release/7-3/alpine313/docker/Dockerfile
diff --git a/release/preview/alpine313/meta.json b/release/7-3/alpine313/meta.json
similarity index 100%
rename from release/preview/alpine313/meta.json
rename to release/7-3/alpine313/meta.json
diff --git a/release/stable/alpine313/test-deps/docker/Dockerfile b/release/7-3/alpine313/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/alpine313/test-deps/docker/Dockerfile
rename to release/7-3/alpine313/test-deps/docker/Dockerfile
diff --git a/release/preview/alpine313/test-deps/meta.json b/release/7-3/alpine313/test-deps/meta.json
similarity index 100%
rename from release/preview/alpine313/test-deps/meta.json
rename to release/7-3/alpine313/test-deps/meta.json
diff --git a/release/preview/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
similarity index 100%
rename from release/preview/alpine314/docker/Dockerfile
rename to release/7-3/alpine314/docker/Dockerfile
diff --git a/release/preview/alpine314/meta.json b/release/7-3/alpine314/meta.json
similarity index 100%
rename from release/preview/alpine314/meta.json
rename to release/7-3/alpine314/meta.json
diff --git a/release/stable/alpine314/test-deps/docker/Dockerfile b/release/7-3/alpine314/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/alpine314/test-deps/docker/Dockerfile
rename to release/7-3/alpine314/test-deps/docker/Dockerfile
diff --git a/release/preview/alpine314/test-deps/meta.json b/release/7-3/alpine314/test-deps/meta.json
similarity index 100%
rename from release/preview/alpine314/test-deps/meta.json
rename to release/7-3/alpine314/test-deps/meta.json
diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/7-3/arm32v7/docker/Dockerfile
similarity index 100%
rename from release/preview/arm32v7/docker/Dockerfile
rename to release/7-3/arm32v7/docker/Dockerfile
diff --git a/release/preview/arm32v7/meta.json b/release/7-3/arm32v7/meta.json
similarity index 100%
rename from release/preview/arm32v7/meta.json
rename to release/7-3/arm32v7/meta.json
diff --git a/release/preview/debian10/docker/Dockerfile b/release/7-3/debian10/docker/Dockerfile
similarity index 100%
rename from release/preview/debian10/docker/Dockerfile
rename to release/7-3/debian10/docker/Dockerfile
diff --git a/release/preview/debian10/meta.json b/release/7-3/debian10/meta.json
similarity index 100%
rename from release/preview/debian10/meta.json
rename to release/7-3/debian10/meta.json
diff --git a/release/preview/debian10/test-deps/docker/Dockerfile b/release/7-3/debian10/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/debian10/test-deps/docker/Dockerfile
rename to release/7-3/debian10/test-deps/docker/Dockerfile
diff --git a/release/preview/debian10/test-deps/meta.json b/release/7-3/debian10/test-deps/meta.json
similarity index 100%
rename from release/preview/debian10/test-deps/meta.json
rename to release/7-3/debian10/test-deps/meta.json
diff --git a/release/preview/debian11/docker/Dockerfile b/release/7-3/debian11/docker/Dockerfile
similarity index 100%
rename from release/preview/debian11/docker/Dockerfile
rename to release/7-3/debian11/docker/Dockerfile
diff --git a/release/preview/debian11/meta.json b/release/7-3/debian11/meta.json
similarity index 100%
rename from release/preview/debian11/meta.json
rename to release/7-3/debian11/meta.json
diff --git a/release/preview/debian11/test-deps/docker/Dockerfile b/release/7-3/debian11/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/debian11/test-deps/docker/Dockerfile
rename to release/7-3/debian11/test-deps/docker/Dockerfile
diff --git a/release/preview/debian11/test-deps/meta.json b/release/7-3/debian11/test-deps/meta.json
similarity index 100%
rename from release/preview/debian11/test-deps/meta.json
rename to release/7-3/debian11/test-deps/meta.json
diff --git a/release/preview/debian9/docker/Dockerfile b/release/7-3/debian9/docker/Dockerfile
similarity index 100%
rename from release/preview/debian9/docker/Dockerfile
rename to release/7-3/debian9/docker/Dockerfile
diff --git a/release/preview/debian9/meta.json b/release/7-3/debian9/meta.json
similarity index 100%
rename from release/preview/debian9/meta.json
rename to release/7-3/debian9/meta.json
diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/7-3/debian9/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/debian9/test-deps/docker/Dockerfile
rename to release/7-3/debian9/test-deps/docker/Dockerfile
diff --git a/release/preview/debian9/test-deps/meta.json b/release/7-3/debian9/test-deps/meta.json
similarity index 100%
rename from release/preview/debian9/test-deps/meta.json
rename to release/7-3/debian9/test-deps/meta.json
diff --git a/release/preview/fedora34/docker/Dockerfile b/release/7-3/fedora34/docker/Dockerfile
similarity index 100%
rename from release/preview/fedora34/docker/Dockerfile
rename to release/7-3/fedora34/docker/Dockerfile
diff --git a/release/preview/fedora34/meta.json b/release/7-3/fedora34/meta.json
similarity index 86%
rename from release/preview/fedora34/meta.json
rename to release/7-3/fedora34/meta.json
index 1be216a3e..9250220a5 100644
--- a/release/preview/fedora34/meta.json
+++ b/release/7-3/fedora34/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux": true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/preview/fedora34/test-deps/docker/Dockerfile b/release/7-3/fedora34/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/fedora34/test-deps/docker/Dockerfile
rename to release/7-3/fedora34/test-deps/docker/Dockerfile
diff --git a/release/preview/fedora34/test-deps/meta.json b/release/7-3/fedora34/test-deps/meta.json
similarity index 100%
rename from release/preview/fedora34/test-deps/meta.json
rename to release/7-3/fedora34/test-deps/meta.json
diff --git a/release/preview/mariner1/docker/Dockerfile b/release/7-3/mariner1/docker/Dockerfile
similarity index 100%
rename from release/preview/mariner1/docker/Dockerfile
rename to release/7-3/mariner1/docker/Dockerfile
diff --git a/release/preview/mariner1/meta.json b/release/7-3/mariner1/meta.json
similarity index 100%
rename from release/preview/mariner1/meta.json
rename to release/7-3/mariner1/meta.json
diff --git a/release/preview/mariner1/test-deps/docker/Dockerfile b/release/7-3/mariner1/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/mariner1/test-deps/docker/Dockerfile
rename to release/7-3/mariner1/test-deps/docker/Dockerfile
diff --git a/release/preview/mariner1/test-deps/meta.json b/release/7-3/mariner1/test-deps/meta.json
similarity index 100%
rename from release/preview/mariner1/test-deps/meta.json
rename to release/7-3/mariner1/test-deps/meta.json
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/7-3/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/preview/nanoserver1809/docker/Dockerfile
rename to release/7-3/nanoserver1809/docker/Dockerfile
diff --git a/release/preview/nanoserver1809/meta.json b/release/7-3/nanoserver1809/meta.json
similarity index 100%
rename from release/preview/nanoserver1809/meta.json
rename to release/7-3/nanoserver1809/meta.json
diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/7-3/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/stable/nanoserver2022/docker/Dockerfile
rename to release/7-3/nanoserver2022/docker/Dockerfile
diff --git a/release/preview/nanoserver2022/meta.json b/release/7-3/nanoserver2022/meta.json
similarity index 100%
rename from release/preview/nanoserver2022/meta.json
rename to release/7-3/nanoserver2022/meta.json
diff --git a/release/preview/nanoserver20H2/docker/Dockerfile b/release/7-3/nanoserver20H2/docker/Dockerfile
similarity index 100%
rename from release/preview/nanoserver20H2/docker/Dockerfile
rename to release/7-3/nanoserver20H2/docker/Dockerfile
diff --git a/release/preview/nanoserver20H2/meta.json b/release/7-3/nanoserver20H2/meta.json
similarity index 100%
rename from release/preview/nanoserver20H2/meta.json
rename to release/7-3/nanoserver20H2/meta.json
diff --git a/release/preview/ubi84/docker/Dockerfile b/release/7-3/ubi84/docker/Dockerfile
similarity index 91%
rename from release/preview/ubi84/docker/Dockerfile
rename to release/7-3/ubi84/docker/Dockerfile
index 9fa4bb35b..31c3ab7a2 100644
--- a/release/preview/ubi84/docker/Dockerfile
+++ b/release/7-3/ubi84/docker/Dockerfile
@@ -6,17 +6,14 @@ ARG PS_VERSION=7.3.0-preview.1
 ARG PACKAGE_VERSION=7.3.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
 
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}-preview
 # Install powershell
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
 FROM registry.access.redhat.com/ubi8/ubi:8.4 AS final-image
 ARG PS_VERSION=7.3.0-preview.1
-ARG PS_INSTALL_VERSION=7
+ARG PS_INSTALL_VERSION=7-preview
 
 RUN --mount=type=cache,target=/var/cache/yum,rw \
     yum update -y \
@@ -37,8 +34,7 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     && yum upgrade-minimal -y --security \
     && yum clean all
 # Define ENVs for Localization/Globalization
-ENV PS_INSTALL_VERSION=7 \
-    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}-preview \
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
diff --git a/release/preview/ubi84/meta.json b/release/7-3/ubi84/meta.json
similarity index 87%
rename from release/preview/ubi84/meta.json
rename to release/7-3/ubi84/meta.json
index d37173ede..0f60875e3 100644
--- a/release/preview/ubi84/meta.json
+++ b/release/7-3/ubi84/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Universal Base Image 8.4",
     "FullRepository": "powershell/rhel",
diff --git a/release/stable/ubi84/test-deps/docker/Dockerfile b/release/7-3/ubi84/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/ubi84/test-deps/docker/Dockerfile
rename to release/7-3/ubi84/test-deps/docker/Dockerfile
diff --git a/release/preview/ubi84/test-deps/meta.json b/release/7-3/ubi84/test-deps/meta.json
similarity index 100%
rename from release/preview/ubi84/test-deps/meta.json
rename to release/7-3/ubi84/test-deps/meta.json
diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/7-3/ubuntu16.04/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu16.04/docker/Dockerfile
rename to release/7-3/ubuntu16.04/docker/Dockerfile
diff --git a/release/preview/ubuntu16.04/meta.json b/release/7-3/ubuntu16.04/meta.json
similarity index 86%
rename from release/preview/ubuntu16.04/meta.json
rename to release/7-3/ubuntu16.04/meta.json
index 3bc25fa81..d6c694009 100644
--- a/release/preview/ubuntu16.04/meta.json
+++ b/release/7-3/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "preview-ubuntu-#shorttag#"
diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu16.04/test-deps/docker/Dockerfile
rename to release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
diff --git a/release/preview/ubuntu16.04/test-deps/meta.json b/release/7-3/ubuntu16.04/test-deps/meta.json
similarity index 100%
rename from release/preview/ubuntu16.04/test-deps/meta.json
rename to release/7-3/ubuntu16.04/test-deps/meta.json
diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/7-3/ubuntu18.04/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu18.04/docker/Dockerfile
rename to release/7-3/ubuntu18.04/docker/Dockerfile
diff --git a/release/preview/ubuntu18.04/meta.json b/release/7-3/ubuntu18.04/meta.json
similarity index 86%
rename from release/preview/ubuntu18.04/meta.json
rename to release/7-3/ubuntu18.04/meta.json
index 4f991379d..cb5598d5a 100644
--- a/release/preview/ubuntu18.04/meta.json
+++ b/release/7-3/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu18.04/test-deps/docker/Dockerfile
rename to release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
diff --git a/release/preview/ubuntu18.04/test-deps/meta.json b/release/7-3/ubuntu18.04/test-deps/meta.json
similarity index 100%
rename from release/preview/ubuntu18.04/test-deps/meta.json
rename to release/7-3/ubuntu18.04/test-deps/meta.json
diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/7-3/ubuntu20.04/docker/Dockerfile
similarity index 100%
rename from release/preview/ubuntu20.04/docker/Dockerfile
rename to release/7-3/ubuntu20.04/docker/Dockerfile
diff --git a/release/preview/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
similarity index 100%
rename from release/preview/ubuntu20.04/meta.json
rename to release/7-3/ubuntu20.04/meta.json
diff --git a/release/stable/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/stable/ubuntu20.04/test-deps/docker/Dockerfile
rename to release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
diff --git a/release/preview/ubuntu20.04/test-deps/meta.json b/release/7-3/ubuntu20.04/test-deps/meta.json
similarity index 100%
rename from release/preview/ubuntu20.04/test-deps/meta.json
rename to release/7-3/ubuntu20.04/test-deps/meta.json
diff --git a/release/stable/windowsserver2022/docker/Dockerfile b/release/7-3/windowsserver2022/docker/Dockerfile
similarity index 100%
rename from release/stable/windowsserver2022/docker/Dockerfile
rename to release/7-3/windowsserver2022/docker/Dockerfile
diff --git a/release/preview/windowsserver2022/meta.json b/release/7-3/windowsserver2022/meta.json
similarity index 100%
rename from release/preview/windowsserver2022/meta.json
rename to release/7-3/windowsserver2022/meta.json
diff --git a/release/stable/windowsservercore2022/docker/Dockerfile b/release/7-3/windowsservercore2022/docker/Dockerfile
similarity index 100%
rename from release/stable/windowsservercore2022/docker/Dockerfile
rename to release/7-3/windowsservercore2022/docker/Dockerfile
diff --git a/release/preview/windowsservercore2022/meta.json b/release/7-3/windowsservercore2022/meta.json
similarity index 100%
rename from release/preview/windowsservercore2022/meta.json
rename to release/7-3/windowsservercore2022/meta.json
diff --git a/release/preview/windowsservercore20H2/docker/Dockerfile b/release/7-3/windowsservercore20H2/docker/Dockerfile
similarity index 100%
rename from release/preview/windowsservercore20H2/docker/Dockerfile
rename to release/7-3/windowsservercore20H2/docker/Dockerfile
diff --git a/release/preview/windowsservercore20H2/meta.json b/release/7-3/windowsservercore20H2/meta.json
similarity index 100%
rename from release/preview/windowsservercore20H2/meta.json
rename to release/7-3/windowsservercore20H2/meta.json
diff --git a/release/servicing/centos7/meta.json b/release/servicing/centos7/meta.json
index f8ee0aef7..153fd5537 100644
--- a/release/servicing/centos7/meta.json
+++ b/release/servicing/centos7/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "CentOS 7",
     "tagTemplates": [
         "#psversion#-centos-#tag#"
diff --git a/release/servicing/debian9/meta.json b/release/servicing/debian9/meta.json
index 6649f1ccb..eb96be443 100644
--- a/release/servicing/debian9/meta.json
+++ b/release/servicing/debian9/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/release/servicing/ubuntu16.04/meta.json b/release/servicing/ubuntu16.04/meta.json
index 33e104bbe..1275c3fd1 100644
--- a/release/servicing/ubuntu16.04/meta.json
+++ b/release/servicing/ubuntu16.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
         "#psversion#-ubuntu-#tag#"
diff --git a/release/servicing/ubuntu18.04/meta.json b/release/servicing/ubuntu18.04/meta.json
index 3501965fd..4eb81b286 100644
--- a/release/servicing/ubuntu18.04/meta.json
+++ b/release/servicing/ubuntu18.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 0634106be..d70b027d6 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -324,10 +324,6 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
             }
 
-            if ($Channel -ne 'preview') {
-                Set-ItResult -Skipped -Because "Test is not applicable to $Channel"
-            }
-
             $psDistChannel = Get-PowerShellDistibutionChannel -TestContext $testContext -Name $Name
             $psDistChannel | Should -BeLike "PSDocker-*"
         }
@@ -338,18 +334,8 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             $permissionsTestCases = @(
                 $script:linuxContainerRunTests | ForEach-Object {
                     $path = '/opt/microsoft/powershell/6/pwsh'
-                    switch -RegEx ($_.Channel)
-                    {
-                        'stable' {
-                            $path = '/opt/microsoft/powershell/7/pwsh'
-                        }
-                        'lts' {
-                            $path = '/opt/microsoft/powershell/7-lts/pwsh'
-                        }
-                        'preview' {
-                            $path = '/opt/microsoft/powershell/7-preview/pwsh'
-                        }
-                    }
+                    $pwshInstallFolder = Get-PwshInstallVersion -Channel $_.Channel
+                    $path = "/opt/microsoft/powershell/$pwshInstallFolder/pwsh"
 
                     $Arm32 = [bool] $_.TestProperties.Arm32
                     @{
@@ -725,10 +711,6 @@ Describe "Windows Containers" -Tags 'Behavior', 'Windows' {
                 Set-ItResult -Pending -Because "Images that use ACR can't be tested"
             }
 
-            if ($Channel -ne 'preview') {
-                Set-ItResult -Skipped -Because "Test is not applicable to $Channel"
-            }
-
             $psDistChannel = Get-PowerShellDistibutionChannel -TestContext $testContext -Name $Name
             $psDistChannel | Should -BeLike "PSDocker-*"
         }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 4fe17b827..ecbd74b5a 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -85,47 +85,72 @@ function Get-PowerShellVersion
     return $retVersion
 }
 
+function Get-ChannelPath
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $Channel
+    )
+
+    $relativePath = $channelData | Where-Object {$_.Name -eq $Channel} | Select-Object -ExpandProperty Path -First 1
+    $repoRoot = Join-Path -Path $PSScriptRoot -ChildPath '..\..'
+    $resolvedRepoRoot = (Resolve-Path -Path $repoRoot).ProviderPath
+    return Join-Path -Path $resolvedRepoRoot -ChildPath $relativePath
+}
+
+function Get-ChannelPackageTag
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $Channel
+    )
+
+    return $channelData | Where-Object {$_.Name -eq $Channel} | Select-Object -ExpandProperty PackageTag -First 1
+}
+
+function Get-PwshInstallVersion
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $Channel
+    )
+
+    return $channelData | Where-Object {$_.Name -eq $Channel} | Select-Object -ExpandProperty pwshInstallVersion -First 1
+}
+
+function Get-ChannelTagPrefix {
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $Channel
+    )
+
+    return $channelData | Where-Object {$_.Name -eq $Channel} | Select-Object -ExpandProperty TagPrefix -First 1
+}
+
+function Get-ChannelNames {
+    $channelData = Get-ChannelData
+    $channelNames = $channelData | Select-Object -ExpandProperty Name
+    return $channelNames
+}
+
 # Gets list of images names
 function Get-ImageList
 {
     param(
         [Parameter(HelpMessage="Filters returned list to stable or preview images. Default to all images.")]
-        [ValidateSet('stable','preview','servicing','all','community-stable','lts')]
         [string[]]
         $Channel='all'
     )
 
-    # Get the names of the builds.
-    $releasePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\release'
-    $stablePath = Join-Path -Path $releasePath -ChildPath 'stable'
-    $ltsPath = Join-Path -Path $releasePath -ChildPath 'lts'
-    $previewPath = Join-Path -Path $releasePath -ChildPath 'preview'
-    $servicingPath = Join-Path -Path $releasePath -ChildPath 'servicing'
-    $communityStablePath = Join-Path -Path $releasePath -ChildPath 'community-stable'
-
-    if ($Channel -in 'stable', 'all')
-    {
-        Get-ChildItem -Path $stablePath -Directory | Select-Object -ExpandProperty Name | Write-Output
-    }
-
-    if ($Channel -in 'servicing', 'all')
-    {
-        Get-ChildItem -Path $servicingPath -Directory | Select-Object -ExpandProperty Name | Write-Output
-    }
-
-    if ($Channel -in 'lts', 'all')
-    {
-        Get-ChildItem -Path $ltsPath -Directory | Select-Object -ExpandProperty Name | Write-Output
-    }
-
-    if ($Channel -in 'preview', 'all')
-    {
-        Get-ChildItem -Path $previewPath -Directory | Select-Object -ExpandProperty Name | Where-Object { $dockerFileNames -notcontains $_ } | Write-Output
-    }
+    $channelList = Get-ChannelNames | Where-Object {$_ -eq $Channel -or $Channel -eq 'all'}
 
-    if ($Channel -in 'community-stable', 'all')
-    {
-        Get-ChildItem -Path $communityStablePath -Directory | Select-Object -ExpandProperty Name | Write-Output
+    foreach($channelName in $channelList){
+        $channelPath = Get-ChannelPath -Channel $channelName
+        Get-ChildItem -Path $channelPath -Directory | Select-Object -ExpandProperty Name | Write-Output
     }
 }
 
@@ -558,9 +583,10 @@ function Get-DockerImageMetaDataWrapper
     }
 
     $actualTagDataByGroup = [System.Collections.Generic.Dictionary[object,TagData]]::new()
+    $tagPrefix = Get-ChannelTagPrefix -Channel $Channel
     foreach ($tagGroup in ($tagDataFromScript | Group-Object -Property 'FromTag'))
     {
-        $actualTagDataByGroup[$tagGroup] = Get-TagData -TagsTemplates $tagsTemplates -TagGroup $tagGroup -Version $Version -ImageName $ImageName -Repository $fullRepository
+        $actualTagDataByGroup[$tagGroup] = Get-TagData -TagsTemplates $tagsTemplates -TagGroup $tagGroup -Version $Version -ImageName $ImageName -Repository $fullRepository -TagPrefix $tagPrefix
     }
 
     $psversion = $Version
@@ -675,6 +701,7 @@ function Get-TestParams
     $buildArgs['PACKAGE_VERSION'] = $packageVersion
     $buildArgs['IMAGE_NAME'] = $imageNameParam
     $buildArgs['BaseImage'] = $BaseImage
+    $buildArgs['PS_INSTALL_VERSION'] = Get-PwshInstallVersion -Channel $actualChannel
 
     if ($allMeta.meta.PackageFormat)
     {
@@ -682,14 +709,10 @@ function Get-TestParams
         {
             $packageUrl = [System.UriBuilder]::new($sasData.sasBase)
 
-            $previewTag = ''
-            if($psversion -like '*-*')
-            {
-                $previewTag = '-preview'
-            }
+            $channelTag = Get-ChannelPackageTag -Channel $actualChannel
 
             $packageName = $allMeta.meta.PackageFormat -replace '\${PS_VERSION}', $packageVersion
-            $packageName = $packageName -replace '\${previewTag}', $previewTag
+            $packageName = $packageName -replace '\${channelTag}', $channelTag
             $containerName = 'v' + ($psversion -replace '\.', '-') -replace '~', '-'
             $packageUrl.Path = $packageUrl.Path + $containerName + '/' + $packageName
             $packageUrl.Query = $sasData.sasQuery
@@ -708,14 +731,10 @@ function Get-TestParams
         {
             $packageUrl = [System.UriBuilder]::new('https://github.com/PowerShell/PowerShell/releases/download/')
 
-            $previewTag = ''
-            if($psversion -like '*-*')
-            {
-                $previewTag = '-preview'
-            }
+            $channelTag = Get-ChannelPackageTag -Channel $actualChannel
 
             $packageName = $allMeta.meta.PackageFormat -replace '\${PS_VERSION}', $packageVersion
-            $packageName = $packageName -replace '\${previewTag}', $previewTag
+            $packageName = $packageName -replace '\${channelTag}', $channelTag
             $containerName = 'v' + ($psversion -replace '~', '-')
             $packageUrl.Path = $packageUrl.Path + $containerName + '/' + $packageName
             $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.ToString())
@@ -763,7 +782,9 @@ function Get-TagData
         [string]
         $ImageName,
         [string]
-        $Repository
+        $Repository,
+        [string]
+        $TagPrefix
     )
 
     $actualTags = @()
@@ -771,6 +792,10 @@ function Get-TagData
     foreach ($tagTemplate in $tagsTemplates) {
         $templateActualTags = Format-TagTemplate -TagTemplate $tagTemplate -TagGroup $TagGroup -Version $Version
         foreach ($actualTag in $templateActualTags) {
+            if($TagPrefix) {
+                $actualTag = $TagPrefix + '-' + $actualTag
+            }
+
             $actualTags += "${ImageName}/${Repository}:$actualTag"
             $tagList += $actualTag
         }
@@ -866,6 +891,24 @@ function New-SasData
     }
 }
 
+class ChannelData {
+    [string] $Name
+    [string] $Path
+    [string] $TagPrefix
+    [string] $PwshInstallVersion
+    [string] $PackageTag
+}
+
+[ChannelData[]] $channelData = $null
+function Get-ChannelData {
+    if (!$Script:channelData) {
+        $jsonPath = Join-Path $PSScriptRoot -ChildPath 'channels.json'
+        $Script:channelData = Get-Content -Raw -Path $jsonPath | ConvertFrom-Json -Depth 100 -AsHashtable
+    }
+
+    return $Script:channelData
+}
+
 function Invoke-PesterWrapper {
     param(
         [string]
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
new file mode 100644
index 000000000..570efd13a
--- /dev/null
+++ b/tools/buildHelper/channels.json
@@ -0,0 +1,27 @@
+[
+    {
+        "name": "stable",
+        "path": "release/7-2",
+        "pwshInstallVersion": "7",
+        "packageTag": ""
+    },
+    {
+        "name": "preview",
+        "path": "release/7-3",
+        "pwshInstallVersion": "7-preview",
+        "packageTag": "-preview"
+    },
+    {
+        "name": "lts",
+        "path": "release/7-2",
+        "tagPrefix": "lts",
+        "pwshInstallVersion": "7-lts",
+        "packageTag": "-lts"
+    },
+    {
+        "name": "community-stable",
+        "path": "release/community-stable",
+        "pwshInstallVersion": "7",
+        "packageTag": ""
+    }
+]
diff --git a/unittests/build.tests.ps1 b/unittests/build.tests.ps1
new file mode 100644
index 000000000..73d3600cb
--- /dev/null
+++ b/unittests/build.tests.ps1
@@ -0,0 +1,29 @@
+Describe "buildps1-Build" {
+    BeforeAll {
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+        Import-Module -Name "$repoRoot/tools/buildHelper/buildHelper.psm1" -Force
+        Mock -CommandName "Invoke-PesterWrapper" -MockWith {
+            Write-Verbose "Mocking Invoke-PesterWrapper" -Verbose
+        } -ParameterFilter { $ExtraParams -ne $null}
+    }
+    Context "-Channel -Name" {
+        It "Should invoke pester" {
+            & $buildScript -Build -Name "mariner1" -Channel preview 4>&1 | out-null
+            Assert-VerifiableMock
+        }
+        It "throw if name doesn't exist" {
+            [Type] $exceptionType = [System.Management.Automation.ParameterBindingException]
+            {& $buildScript -Build -Name "doesntexist" -Channel preview 4>&1 } | Should -Throw -ExceptionType $exceptionType
+        }
+    }
+    Context "-channel -all" {
+        It "Should invoke pester" {
+            & $buildScript -Build -channel stable -all 4>&1 | out-null
+            Assert-VerifiableMock
+        }
+    }
+}
diff --git a/unittests/checkForDuplicateTags.tests.ps1 b/unittests/checkForDuplicateTags.tests.ps1
new file mode 100644
index 000000000..a3a2ab515
--- /dev/null
+++ b/unittests/checkForDuplicateTags.tests.ps1
@@ -0,0 +1,15 @@
+Describe "build.ps1 -CheckForDuplicateTags" {
+    BeforeAll {
+        Get-Module -Name "buildHelper" | Remove-Module -Force
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+    }
+
+    It "Should not throw" {
+        $verboseLog = & $buildScript -CheckForDuplicateTags -Channel stable, lts, preview 4>&1
+        $verboseLog | Should -Not -BeNullOrEmpty
+    }
+}
diff --git a/unittests/generateManifestLists.tests.ps1 b/unittests/generateManifestLists.tests.ps1
new file mode 100644
index 000000000..84a12edca
--- /dev/null
+++ b/unittests/generateManifestLists.tests.ps1
@@ -0,0 +1,16 @@
+Describe "build.ps1 -GenerateManifestLists" {
+    BeforeAll {
+        Get-Module -Name "buildHelper" | Remove-Module -Force
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+    }
+
+    It "Should not throw" {
+        $json = & $buildScript -GenerateManifestLists -Channel stable -OsFilter All 4>$null
+        $json | Should -Not -BeNullOrEmpty
+        $json | ConvertFrom-Json -AsHashtable | Should -Not -BeNullOrEmpty
+    }
+}
diff --git a/unittests/generateMatrixJson.tests.ps1 b/unittests/generateMatrixJson.tests.ps1
new file mode 100644
index 000000000..a0e34c221
--- /dev/null
+++ b/unittests/generateMatrixJson.tests.ps1
@@ -0,0 +1,120 @@
+Describe "build.ps1 -GenerateMatrixJson" {
+    BeforeAll {
+        Get-Module -Name "buildHelper" | Remove-Module -Force
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+    }
+    Context "By channel" {
+        BeforeAll {
+            $script:imageTestCases = @()
+            [string[]]$global:writeHostBuffer = @()
+            function Write-Host {
+                param(
+                    [object]$Object
+                )
+                Write-Verbose "got write-Host" -Verbose
+                $global:writeHostBuffer += $Object.ToString()
+            }
+        }
+        BeforeEach {
+            $Channel = 'stable'
+            $pattern = '##vso\[task\.setvariable variable=matrix_'+$Channel+'_(windows|linux);isoutput=true]'
+        }
+        It "Should Write to host" {
+            $vstsCmd = & $buildScript -GenerateMatrixJson -Channel $Channel 4>$null
+            $Global:writeHostBuffer.count | should -BeGreaterThan 1
+        }
+        It "Commands sholud be vso commands" {
+            foreach($vstsCmd in $Global:writeHostBuffer) {
+                $vstsCmd | Should -Match $pattern
+            }
+        }
+        It "Should have generated valid json" {
+            $script:matrix = @()
+            foreach($vstsCmd in $Global:writeHostBuffer) {
+                Write-Verbose "vstsCmd: $vstsCmd"
+                $json = $vstsCmd -replace $pattern
+                { $script:matrix += $json | ConvertFrom-Json -AsHashtable } | should -not -Throw
+            }
+            $script:matrix.count | Should -Be 2
+        }
+        It "Should have multiple images" {
+            foreach($platforMatrix in $Script:matrix) {
+                Write-Verbose "platform: $platforMatrix"
+                $platforMatrix.Keys.count | Should -BeGreaterThan
+                foreach($key in $platforMatrix.Keys) {
+                    $image = $platforMatrix[$key]
+                    $script:imageTestCases += ($image)
+                }
+            }
+        }
+
+        It "<ImageName> Should have all its properties" -TestCases $imageTestCases {
+            param(
+                $ImageName,
+                $ContinueOnError,
+                $OsVersion,
+                $DistributionState,
+                $EndOfLife,
+                $Channel,
+                $JobName
+            )
+
+            $ImageName          | Should -Not -BeNullOrEmpty
+            $ContinueOnError    | Should -BeOfType [bool]
+            $OsVersion          | Should -Not -BeNullOrEmpty
+            $DistributionState  | Should -Match '^(unknown|validated|validating|endoflife)$'
+            $EndOfLife          | Should -BeOfType [datetime]
+            $Channel            | Should -Be $Channel
+            $JobName            | Should -Match '^[^ \-]+$'
+        }
+    }
+    Context "Full matrix Json" {
+        BeforeAll {
+            $script:imageTestCases = @()
+        }
+        BeforeEach {
+            $pattern = '##vso\[task\.setvariable variable=matrix_'+$Channel+'_(windows|linux);isoutput=true]'
+        }
+        It "Should generate json" {
+            $json = & $buildScript -GenerateMatrixJson -FullJson 4>$null
+            $script:matrix = @()
+            $script:matrix = $json | ConvertFrom-Json -AsHashtable
+            $script:matrix.Keys.count | Should -BeGreaterThan 2
+        }
+
+        It "Should have multiple images" {
+            foreach($platforMatrix in $Script:matrix) {
+                Write-Verbose "platform: $platforMatrix"
+                $platforMatrix.Keys.count | Should -BeGreaterThan
+                foreach($key in $platforMatrix.Keys) {
+                    $image = $platforMatrix[$key]
+                    $script:imageTestCases += ($image)
+                }
+            }
+        }
+
+        It "<Channel>-<ImageName> Should have all its properties" -TestCases $imageTestCases {
+            param(
+                $ImageName,
+                $ContinueOnError,
+                $OsVersion,
+                $DistributionState,
+                $EndOfLife,
+                $Channel,
+                $JobName
+            )
+
+            $ImageName          | Should -Not -BeNullOrEmpty
+            $ContinueOnError    | Should -BeOfType [bool]
+            $OsVersion          | Should -Not -BeNullOrEmpty
+            $DistributionState  | Should -Match '^(unknown|validated|validating|endoflife)$'
+            $EndOfLife          | Should -BeOfType [datetime]
+            $Channel            | Should -Be $Channel
+            $JobName            | Should -Match '^[^ \-]+$'
+        }
+    }
+}
diff --git a/unittests/generateTagsYaml.tests.ps1 b/unittests/generateTagsYaml.tests.ps1
new file mode 100644
index 000000000..1f617b801
--- /dev/null
+++ b/unittests/generateTagsYaml.tests.ps1
@@ -0,0 +1,15 @@
+Describe "build.ps1 -GenerateTagsYaml" {
+    BeforeAll {
+        Get-Module -Name "buildHelper" | Remove-Module -Force
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+    }
+
+    It "Should generate tags.yaml" {
+        $yaml = & $buildScript -GenerateTagsYaml -Channel stable, lts, preview 4>$null
+        $yaml | Should -Not -BeNullOrEmpty
+    }
+}
diff --git a/unittests/getTags.tests.ps1 b/unittests/getTags.tests.ps1
new file mode 100644
index 000000000..451ee16ac
--- /dev/null
+++ b/unittests/getTags.tests.ps1
@@ -0,0 +1,26 @@
+Describe "build.ps1 -GetTags" {
+    BeforeAll {
+        Get-Module -Name "buildHelper" | Remove-Module -Force
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+    }
+
+    Context "-Channel -Name" {
+        It "Should invoke pester" {
+            & $buildScript -GetTags -Name 'mariner1' -Channel preview -Version v7.2.2 4>&1 | out-null
+        }
+        It "throw for non existant image" {
+            [Type] $exceptionType = [System.Management.Automation.ParameterBindingException]
+            {& $buildScript -GetTags -Name 'doesnt exist' -Channel preview -Version v7.2.2 4>&1} | Should -Throw -ExceptionType $exceptionType
+        }
+    }
+    Context "-channel -all" {
+        It "Should invoke pester" {
+            & $buildScript -GetTags -channel stable -all -Version v7.2.2 4>&1 | out-null
+            Assert-VerifiableMock
+        }
+    }
+}
diff --git a/unittests/test.tests.ps1 b/unittests/test.tests.ps1
new file mode 100644
index 000000000..55fcb7c83
--- /dev/null
+++ b/unittests/test.tests.ps1
@@ -0,0 +1,30 @@
+Describe "build.ps1 -Test" {
+    BeforeAll {
+        $relativeRepoRoot = Join-Path $PSScriptRoot ".."
+        $repoRoot = (Resolve-Path -Path $relativeRepoRoot).ProviderPath
+        Write-Verbose "repoRoot: $repoRoot"
+        $buildScript = Join-Path $repoRoot "build.ps1"
+        Write-Verbose "buildScript: $buildScript"
+        Import-Module -Name "$repoRoot/tools/buildHelper/buildHelper.psm1" -Force
+        Mock -CommandName "Invoke-PesterWrapper" -MockWith {
+            Write-Verbose "Mocking Invoke-PesterWrapper" -Verbose
+        } -ParameterFilter { $ExtraParams -ne $null}
+    }
+    Context "-Channel -Name" {
+        It "Should invoke pester" {
+            & $buildScript -Test -Pull -ImageName "unittest" -Name 'mariner1' -Channel preview -Version v7.2.2 4>&1 | out-null
+            Assert-VerifiableMock
+        }
+        It "throw for non existant image" {
+            [Type] $exceptionType = [System.Management.Automation.ParameterBindingException]
+            {& $buildScript -Test -Pull -ImageName "unittest" -Name 'doesnt exist' -Channel preview -Version v7.2.2 4>&1} | Should -Throw -ExceptionType $exceptionType
+            Assert-VerifiableMock
+        }
+    }
+    Context "-channel -all" {
+        It "Should invoke pester" {
+            & $buildScript -Test -channel stable -all -Version v7.2.2 4>&1 | out-null
+            Assert-VerifiableMock
+        }
+    }
+}

From 100297549008076f22511efbaedbd2d26379b241 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Apr 2022 11:33:27 -0700
Subject: [PATCH 185/354] Delete unused docker images (#632)

---
 release/7-1/alpine311/docker/Dockerfile       | 87 -----------------
 release/7-1/alpine311/meta.json               | 18 ----
 .../7-1/alpine311/test-deps/docker/Dockerfile | 38 --------
 release/7-1/alpine311/test-deps/meta.json     | 19 ----
 release/7-1/alpine312/docker/Dockerfile       | 87 -----------------
 release/7-1/alpine312/meta.json               | 18 ----
 .../7-1/alpine312/test-deps/docker/Dockerfile | 38 --------
 release/7-1/alpine312/test-deps/meta.json     | 19 ----
 release/7-1/alpine313/docker/Dockerfile       | 87 -----------------
 release/7-1/alpine313/meta.json               | 18 ----
 .../7-1/alpine313/test-deps/docker/Dockerfile | 38 --------
 release/7-1/alpine313/test-deps/meta.json     | 19 ----
 release/7-1/alpine314/docker/Dockerfile       | 87 -----------------
 release/7-1/alpine314/meta.json               | 18 ----
 .../7-1/alpine314/test-deps/docker/Dockerfile | 38 --------
 release/7-1/alpine314/test-deps/meta.json     | 19 ----
 release/7-1/arm32v7/docker/Dockerfile         | 70 --------------
 release/7-1/arm32v7/meta.json                 | 21 ----
 release/7-1/centos7/docker/Dockerfile         | 54 -----------
 release/7-1/centos7/meta.json                 | 17 ----
 .../7-1/centos7/test-deps/docker/Dockerfile   | 18 ----
 release/7-1/centos7/test-deps/meta.json       | 15 ---
 release/7-1/debian10/docker/Dockerfile        | 96 -------------------
 release/7-1/debian10/meta.json                | 20 ----
 .../7-1/debian10/test-deps/docker/Dockerfile  | 22 -----
 release/7-1/debian10/test-deps/meta.json      | 16 ----
 release/7-1/debian11/docker/Dockerfile        | 95 ------------------
 release/7-1/debian11/meta.json                | 20 ----
 .../7-1/debian11/test-deps/docker/Dockerfile  | 22 -----
 release/7-1/debian11/test-deps/meta.json      | 16 ----
 release/7-1/debian9/docker/Dockerfile         | 64 -------------
 release/7-1/debian9/meta.json                 | 19 ----
 .../7-1/debian9/test-deps/docker/Dockerfile   | 22 -----
 release/7-1/debian9/test-deps/meta.json       | 16 ----
 release/7-1/fedora32/docker/Dockerfile        | 62 ------------
 release/7-1/fedora32/meta.json                | 18 ----
 .../7-1/fedora32/test-deps/docker/Dockerfile  | 21 ----
 release/7-1/fedora32/test-deps/meta.json      | 15 ---
 release/7-1/nanoserver1809/docker/Dockerfile  | 90 -----------------
 release/7-1/nanoserver1809/meta.json          | 21 ----
 release/7-1/nanoserver1909/docker/Dockerfile  | 90 -----------------
 release/7-1/nanoserver1909/meta.json          | 22 -----
 release/7-1/nanoserver2004/docker/Dockerfile  | 90 -----------------
 release/7-1/nanoserver2004/meta.json          | 22 -----
 release/7-1/nanoserver2022/docker/Dockerfile  | 92 ------------------
 release/7-1/nanoserver2022/meta.json          | 22 -----
 release/7-1/nanoserver20H2/docker/Dockerfile  | 90 -----------------
 release/7-1/nanoserver20H2/meta.json          | 19 ----
 release/7-1/ubuntu16.04/docker/Dockerfile     | 60 ------------
 release/7-1/ubuntu16.04/meta.json             | 19 ----
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ----
 release/7-1/ubuntu16.04/test-deps/meta.json   | 16 ----
 release/7-1/ubuntu18.04/docker/Dockerfile     | 60 ------------
 release/7-1/ubuntu18.04/meta.json             | 19 ----
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ----
 release/7-1/ubuntu18.04/test-deps/meta.json   | 16 ----
 release/7-1/ubuntu20.04/docker/Dockerfile     | 94 ------------------
 release/7-1/ubuntu20.04/meta.json             | 22 -----
 .../ubuntu20.04/test-deps/docker/Dockerfile   | 21 ----
 release/7-1/ubuntu20.04/test-deps/meta.json   | 16 ----
 .../7-1/windowsserver2022/docker/Dockerfile   | 72 --------------
 release/7-1/windowsserver2022/meta.json       | 22 -----
 .../windowsservercore1909/docker/Dockerfile   | 70 --------------
 release/7-1/windowsservercore1909/meta.json   | 22 -----
 .../windowsservercore2004/docker/Dockerfile   | 70 --------------
 release/7-1/windowsservercore2004/meta.json   | 22 -----
 .../windowsservercore2022/docker/Dockerfile   | 72 --------------
 release/7-1/windowsservercore2022/meta.json   | 22 -----
 .../windowsservercore20H2/docker/Dockerfile   | 70 --------------
 release/7-1/windowsservercore20H2/meta.json   | 19 ----
 release/lts/arm32v7/docker/Dockerfile         | 73 --------------
 release/lts/arm32v7/meta.json                 | 21 ----
 release/lts/debian10/dependabot/Dockerfile    |  6 --
 release/lts/debian10/docker/Dockerfile        | 95 ------------------
 release/lts/debian10/meta.json                | 21 ----
 .../lts/debian10/test-deps/docker/Dockerfile  | 22 -----
 release/lts/debian10/test-deps/meta.json      | 16 ----
 release/lts/debian11/dependabot/Dockerfile    |  6 --
 release/lts/debian11/docker/Dockerfile        | 94 ------------------
 release/lts/debian11/meta.json                | 21 ----
 .../lts/debian11/test-deps/docker/Dockerfile  | 22 -----
 release/lts/debian11/test-deps/meta.json      | 16 ----
 release/lts/nanoserver1809/docker/Dockerfile  | 89 -----------------
 release/lts/nanoserver1809/meta.json          | 23 -----
 release/lts/nanoserver2022/docker/Dockerfile  | 92 ------------------
 release/lts/nanoserver2022/meta.json          | 23 -----
 .../lts/nanoserver20H2/dependabot/Dockerfile  |  6 --
 release/lts/nanoserver20H2/docker/Dockerfile  | 89 -----------------
 release/lts/nanoserver20H2/meta.json          | 20 ----
 release/lts/ubuntu16.04/docker/Dockerfile     | 60 ------------
 release/lts/ubuntu16.04/meta.json             | 20 ----
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 21 ----
 release/lts/ubuntu16.04/test-deps/meta.json   | 16 ----
 release/lts/ubuntu18.04/dependabot/Dockerfile |  6 --
 release/lts/ubuntu18.04/docker/Dockerfile     | 60 ------------
 release/lts/ubuntu18.04/meta.json             | 23 -----
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 21 ----
 release/lts/ubuntu18.04/test-deps/meta.json   | 16 ----
 .../lts/windowsserver2022/docker/Dockerfile   | 72 --------------
 release/lts/windowsserver2022/meta.json       | 23 -----
 .../windowsservercore2022/docker/Dockerfile   | 72 --------------
 release/lts/windowsservercore2022/meta.json   | 23 -----
 .../dependabot/Dockerfile                     |  6 --
 .../windowsservercore20H2/docker/Dockerfile   | 67 -------------
 release/lts/windowsservercore20H2/meta.json   | 20 ----
 release/servicing/centos7/docker/Dockerfile   | 54 -----------
 release/servicing/centos7/meta.json           | 13 ---
 release/servicing/debian9/docker/Dockerfile   | 61 ------------
 release/servicing/debian9/meta.json           | 14 ---
 .../nanoserver1809/docker/Dockerfile          | 87 -----------------
 release/servicing/nanoserver1809/meta.json    | 26 -----
 .../servicing/opensuse423/docker/Dockerfile   | 88 -----------------
 release/servicing/opensuse423/meta.json       | 14 ---
 .../servicing/ubuntu16.04/docker/Dockerfile   | 58 -----------
 release/servicing/ubuntu16.04/meta.json       | 14 ---
 .../servicing/ubuntu18.04/docker/Dockerfile   | 58 -----------
 release/servicing/ubuntu18.04/meta.json       | 14 ---
 .../windowsservercore/docker/Dockerfile       | 67 -------------
 release/servicing/windowsservercore/meta.json | 12 ---
 119 files changed, 4652 deletions(-)
 delete mode 100644 release/7-1/alpine311/docker/Dockerfile
 delete mode 100644 release/7-1/alpine311/meta.json
 delete mode 100644 release/7-1/alpine311/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/alpine311/test-deps/meta.json
 delete mode 100644 release/7-1/alpine312/docker/Dockerfile
 delete mode 100644 release/7-1/alpine312/meta.json
 delete mode 100644 release/7-1/alpine312/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/alpine312/test-deps/meta.json
 delete mode 100644 release/7-1/alpine313/docker/Dockerfile
 delete mode 100644 release/7-1/alpine313/meta.json
 delete mode 100644 release/7-1/alpine313/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/alpine313/test-deps/meta.json
 delete mode 100644 release/7-1/alpine314/docker/Dockerfile
 delete mode 100644 release/7-1/alpine314/meta.json
 delete mode 100644 release/7-1/alpine314/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/alpine314/test-deps/meta.json
 delete mode 100644 release/7-1/arm32v7/docker/Dockerfile
 delete mode 100644 release/7-1/arm32v7/meta.json
 delete mode 100644 release/7-1/centos7/docker/Dockerfile
 delete mode 100644 release/7-1/centos7/meta.json
 delete mode 100644 release/7-1/centos7/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/centos7/test-deps/meta.json
 delete mode 100644 release/7-1/debian10/docker/Dockerfile
 delete mode 100644 release/7-1/debian10/meta.json
 delete mode 100644 release/7-1/debian10/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/debian10/test-deps/meta.json
 delete mode 100644 release/7-1/debian11/docker/Dockerfile
 delete mode 100644 release/7-1/debian11/meta.json
 delete mode 100644 release/7-1/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/debian11/test-deps/meta.json
 delete mode 100644 release/7-1/debian9/docker/Dockerfile
 delete mode 100644 release/7-1/debian9/meta.json
 delete mode 100644 release/7-1/debian9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/debian9/test-deps/meta.json
 delete mode 100644 release/7-1/fedora32/docker/Dockerfile
 delete mode 100644 release/7-1/fedora32/meta.json
 delete mode 100644 release/7-1/fedora32/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/fedora32/test-deps/meta.json
 delete mode 100755 release/7-1/nanoserver1809/docker/Dockerfile
 delete mode 100644 release/7-1/nanoserver1809/meta.json
 delete mode 100644 release/7-1/nanoserver1909/docker/Dockerfile
 delete mode 100644 release/7-1/nanoserver1909/meta.json
 delete mode 100644 release/7-1/nanoserver2004/docker/Dockerfile
 delete mode 100644 release/7-1/nanoserver2004/meta.json
 delete mode 100644 release/7-1/nanoserver2022/docker/Dockerfile
 delete mode 100644 release/7-1/nanoserver2022/meta.json
 delete mode 100644 release/7-1/nanoserver20H2/docker/Dockerfile
 delete mode 100644 release/7-1/nanoserver20H2/meta.json
 delete mode 100644 release/7-1/ubuntu16.04/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu16.04/meta.json
 delete mode 100644 release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu16.04/test-deps/meta.json
 delete mode 100644 release/7-1/ubuntu18.04/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu18.04/meta.json
 delete mode 100644 release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu18.04/test-deps/meta.json
 delete mode 100644 release/7-1/ubuntu20.04/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu20.04/meta.json
 delete mode 100644 release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-1/ubuntu20.04/test-deps/meta.json
 delete mode 100644 release/7-1/windowsserver2022/docker/Dockerfile
 delete mode 100644 release/7-1/windowsserver2022/meta.json
 delete mode 100644 release/7-1/windowsservercore1909/docker/Dockerfile
 delete mode 100644 release/7-1/windowsservercore1909/meta.json
 delete mode 100644 release/7-1/windowsservercore2004/docker/Dockerfile
 delete mode 100644 release/7-1/windowsservercore2004/meta.json
 delete mode 100644 release/7-1/windowsservercore2022/docker/Dockerfile
 delete mode 100644 release/7-1/windowsservercore2022/meta.json
 delete mode 100644 release/7-1/windowsservercore20H2/docker/Dockerfile
 delete mode 100644 release/7-1/windowsservercore20H2/meta.json
 delete mode 100644 release/lts/arm32v7/docker/Dockerfile
 delete mode 100644 release/lts/arm32v7/meta.json
 delete mode 100644 release/lts/debian10/dependabot/Dockerfile
 delete mode 100644 release/lts/debian10/docker/Dockerfile
 delete mode 100644 release/lts/debian10/meta.json
 delete mode 100644 release/lts/debian10/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/debian10/test-deps/meta.json
 delete mode 100644 release/lts/debian11/dependabot/Dockerfile
 delete mode 100644 release/lts/debian11/docker/Dockerfile
 delete mode 100644 release/lts/debian11/meta.json
 delete mode 100644 release/lts/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/debian11/test-deps/meta.json
 delete mode 100755 release/lts/nanoserver1809/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver1809/meta.json
 delete mode 100644 release/lts/nanoserver2022/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver2022/meta.json
 delete mode 100644 release/lts/nanoserver20H2/dependabot/Dockerfile
 delete mode 100644 release/lts/nanoserver20H2/docker/Dockerfile
 delete mode 100644 release/lts/nanoserver20H2/meta.json
 delete mode 100644 release/lts/ubuntu16.04/docker/Dockerfile
 delete mode 100644 release/lts/ubuntu16.04/meta.json
 delete mode 100644 release/lts/ubuntu16.04/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/ubuntu16.04/test-deps/meta.json
 delete mode 100644 release/lts/ubuntu18.04/dependabot/Dockerfile
 delete mode 100644 release/lts/ubuntu18.04/docker/Dockerfile
 delete mode 100644 release/lts/ubuntu18.04/meta.json
 delete mode 100644 release/lts/ubuntu18.04/test-deps/docker/Dockerfile
 delete mode 100644 release/lts/ubuntu18.04/test-deps/meta.json
 delete mode 100644 release/lts/windowsserver2022/docker/Dockerfile
 delete mode 100644 release/lts/windowsserver2022/meta.json
 delete mode 100644 release/lts/windowsservercore2022/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore2022/meta.json
 delete mode 100644 release/lts/windowsservercore20H2/dependabot/Dockerfile
 delete mode 100644 release/lts/windowsservercore20H2/docker/Dockerfile
 delete mode 100644 release/lts/windowsservercore20H2/meta.json
 delete mode 100644 release/servicing/centos7/docker/Dockerfile
 delete mode 100644 release/servicing/centos7/meta.json
 delete mode 100644 release/servicing/debian9/docker/Dockerfile
 delete mode 100644 release/servicing/debian9/meta.json
 delete mode 100755 release/servicing/nanoserver1809/docker/Dockerfile
 delete mode 100644 release/servicing/nanoserver1809/meta.json
 delete mode 100644 release/servicing/opensuse423/docker/Dockerfile
 delete mode 100644 release/servicing/opensuse423/meta.json
 delete mode 100644 release/servicing/ubuntu16.04/docker/Dockerfile
 delete mode 100644 release/servicing/ubuntu16.04/meta.json
 delete mode 100644 release/servicing/ubuntu18.04/docker/Dockerfile
 delete mode 100644 release/servicing/ubuntu18.04/meta.json
 delete mode 100755 release/servicing/windowsservercore/docker/Dockerfile
 delete mode 100644 release/servicing/windowsservercore/meta.json

diff --git a/release/7-1/alpine311/docker/Dockerfile b/release/7-1/alpine311/docker/Dockerfile
deleted file mode 100644
index 82cccd512..000000000
--- a/release/7-1/alpine311/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.11 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.11 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.11
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.11
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine311/meta.json b/release/7-1/alpine311/meta.json
deleted file mode 100644
index db4e8ee5b..000000000
--- a/release/7-1/alpine311/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.11"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/7-1/alpine311/test-deps/docker/Dockerfile b/release/7-1/alpine311/test-deps/docker/Dockerfile
deleted file mode 100644
index 835eef9a6..000000000
--- a/release/7-1/alpine311/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.11
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.11
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine311/test-deps/meta.json b/release/7-1/alpine311/test-deps/meta.json
deleted file mode 100644
index c2139fd9e..000000000
--- a/release/7-1/alpine311/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.11",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.11$" : "alpine-3.11"
-    }
-}
diff --git a/release/7-1/alpine312/docker/Dockerfile b/release/7-1/alpine312/docker/Dockerfile
deleted file mode 100644
index 7b8e05a8c..000000000
--- a/release/7-1/alpine312/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.12 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.12.1
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine312/meta.json b/release/7-1/alpine312/meta.json
deleted file mode 100644
index 4db5c23c2..000000000
--- a/release/7-1/alpine312/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.12"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/7-1/alpine312/test-deps/docker/Dockerfile b/release/7-1/alpine312/test-deps/docker/Dockerfile
deleted file mode 100644
index 3d65429f0..000000000
--- a/release/7-1/alpine312/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine312/test-deps/meta.json b/release/7-1/alpine312/test-deps/meta.json
deleted file mode 100644
index 49b703f2b..000000000
--- a/release/7-1/alpine312/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.12$" : "preview-alpine-3.12"
-    }
-}
diff --git a/release/7-1/alpine313/docker/Dockerfile b/release/7-1/alpine313/docker/Dockerfile
deleted file mode 100644
index 727eb5ae5..000000000
--- a/release/7-1/alpine313/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.13.6 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.13.6
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine313/meta.json b/release/7-1/alpine313/meta.json
deleted file mode 100644
index 8660e7601..000000000
--- a/release/7-1/alpine313/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.13"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/7-1/alpine313/test-deps/docker/Dockerfile b/release/7-1/alpine313/test-deps/docker/Dockerfile
deleted file mode 100644
index a95755d16..000000000
--- a/release/7-1/alpine313/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13.6
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine313/test-deps/meta.json b/release/7-1/alpine313/test-deps/meta.json
deleted file mode 100644
index 99b7b5f23..000000000
--- a/release/7-1/alpine313/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.13$" : "preview-alpine-3.13"
-    }
-}
diff --git a/release/7-1/alpine314/docker/Dockerfile b/release/7-1/alpine314/docker/Dockerfile
deleted file mode 100644
index 1a7482805..000000000
--- a/release/7-1/alpine314/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.14.2 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14.2
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine314/meta.json b/release/7-1/alpine314/meta.json
deleted file mode 100644
index a7306fc67..000000000
--- a/release/7-1/alpine314/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.14"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 221
-    }
-}
diff --git a/release/7-1/alpine314/test-deps/docker/Dockerfile b/release/7-1/alpine314/test-deps/docker/Dockerfile
deleted file mode 100644
index 1c4f46570..000000000
--- a/release/7-1/alpine314/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14.2
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-    bash \
-    sudo \
-    shadow \
-    openssl \
-    curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/alpine314/test-deps/meta.json b/release/7-1/alpine314/test-deps/meta.json
deleted file mode 100644
index 6e6446b4e..000000000
--- a/release/7-1/alpine314/test-deps/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "#tag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 295
-    },
-    "TagMapping": {
-        "^.*-alpine-3.14$" : "preview-alpine-3.14"
-    }
-}
diff --git a/release/7-1/arm32v7/docker/Dockerfile b/release/7-1/arm32v7/docker/Dockerfile
deleted file mode 100644
index 840e68f81..000000000
--- a/release/7-1/arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-FROM arm32v7/ubuntu:bionic AS installer-env
-
-ARG PS_VERSION=6.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM arm32v7/ubuntu:bionic AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=6.2.3
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/arm32v7/meta.json b/release/7-1/arm32v7/meta.json
deleted file mode 100644
index 9b772c8a1..000000000
--- a/release/7-1/arm32v7/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
-    "osVersion": "Ubuntu 18.04 ARM 32v7",
-    "SkipGssNtlmSspTests": true,
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-#shorttag#",
-        "arm32v7-ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 550,
-        "Arm32": true
-    }
-}
diff --git a/release/7-1/centos7/docker/Dockerfile b/release/7-1/centos7/docker/Dockerfile
deleted file mode 100644
index 13e534365..000000000
--- a/release/7-1/centos7/docker/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM centos:7 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PACKAGE_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/centos7/meta.json b/release/7-1/centos7/meta.json
deleted file mode 100644
index 2b9ccbaf3..000000000
--- a/release/7-1/centos7/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "#psversion#-centos-#shorttag#",
-        "centos-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "7"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 550
-    }
-}
diff --git a/release/7-1/centos7/test-deps/docker/Dockerfile b/release/7-1/centos7/test-deps/docker/Dockerfile
deleted file mode 100644
index b41a2cefd..000000000
--- a/release/7-1/centos7/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:centos-7
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-CentOS-7
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/centos7/test-deps/meta.json b/release/7-1/centos7/test-deps/meta.json
deleted file mode 100644
index a6e148032..000000000
--- a/release/7-1/centos7/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "centos-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 575
-    }
-}
diff --git a/release/7-1/debian10/docker/Dockerfile b/release/7-1/debian10/docker/Dockerfile
deleted file mode 100644
index 35a48e07f..000000000
--- a/release/7-1/debian10/docker/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.0.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu63 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian10/meta.json b/release/7-1/debian10/meta.json
deleted file mode 100644
index aef74175d..000000000
--- a/release/7-1/debian10/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 10",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "buster-slim"},
-        {"Tag": "10"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    }
-}
-
diff --git a/release/7-1/debian10/test-deps/docker/Dockerfile b/release/7-1/debian10/test-deps/docker/Dockerfile
deleted file mode 100644
index 63bec0248..000000000
--- a/release/7-1/debian10/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-10
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian10/test-deps/meta.json b/release/7-1/debian10/test-deps/meta.json
deleted file mode 100644
index 36de679e8..000000000
--- a/release/7-1/debian10/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 10",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 316
-    }
-}
diff --git a/release/7-1/debian11/docker/Dockerfile b/release/7-1/debian11/docker/Dockerfile
deleted file mode 100644
index 5000c9940..000000000
--- a/release/7-1/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-FROM debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
-
-ARG PS_VERSION=6.2.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian11/meta.json b/release/7-1/debian11/meta.json
deleted file mode 100644
index db901de4b..000000000
--- a/release/7-1/debian11/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 350
-    }
-}
-
diff --git a/release/7-1/debian11/test-deps/docker/Dockerfile b/release/7-1/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index 96a8b9a38..000000000
--- a/release/7-1/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian11/test-deps/meta.json b/release/7-1/debian11/test-deps/meta.json
deleted file mode 100644
index 424e8a54f..000000000
--- a/release/7-1/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 350
-    }
-}
diff --git a/release/7-1/debian9/docker/Dockerfile b/release/7-1/debian9/docker/Dockerfile
deleted file mode 100644
index 67d72d712..000000000
--- a/release/7-1/debian9/docker/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:stretch-slim AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian9/meta.json b/release/7-1/debian9/meta.json
deleted file mode 100644
index 2909eafdb..000000000
--- a/release/7-1/debian9/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.debian.9_amd64.deb",
-    "osVersion": "Debian 9",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "stretch-slim"},
-        {"Tag": "9"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    }
-}
diff --git a/release/7-1/debian9/test-deps/docker/Dockerfile b/release/7-1/debian9/test-deps/docker/Dockerfile
deleted file mode 100644
index 7ab3f2e17..000000000
--- a/release/7-1/debian9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/debian9/test-deps/meta.json b/release/7-1/debian9/test-deps/meta.json
deleted file mode 100644
index 79d8a0610..000000000
--- a/release/7-1/debian9/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 9",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 316
-    }
-}
diff --git a/release/7-1/fedora32/docker/Dockerfile b/release/7-1/fedora32/docker/Dockerfile
deleted file mode 100644
index 71a2cff3a..000000000
--- a/release/7-1/fedora32/docker/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes Fedora 32 image with PowerShell installed from Microsoft YUM Repo
-ARG imageRepo=fedora
-
-FROM ${imageRepo}:32 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && echo "starting misc packages" \
-    && dnf install -y \
-    # less is needed for help
-      less \
-    # Needed to run localdef
-      glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-      compat-openssl10 \
-      ca-certificates \
-      gssntlmssp \
-    && echo "end - misc packages" \
-    # This installs most security advisories
-    && echo "starting upgrade minimal" \
-    && dnf upgrade-minimal -y --security \
-    && echo "end - upgrade minimal" \
-    && echo "verifying all security advisories are installed..." \
-    && dnf updateinfo list -q --security \
-    && echo "end - verifying all security advisories are installed..." \
-    && dnf clean all \
-    #&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/fedora32/meta.json b/release/7-1/fedora32/meta.json
deleted file mode 100644
index 246c00f21..000000000
--- a/release/7-1/fedora32/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora 32",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-fedora-32",
-        "fedora-32-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "32"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/7-1/fedora32/test-deps/docker/Dockerfile b/release/7-1/fedora32/test-deps/docker/Dockerfile
deleted file mode 100644
index d360aad2a..000000000
--- a/release/7-1/fedora32/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-32
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps \
-        findutils \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-32
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/fedora32/test-deps/meta.json b/release/7-1/fedora32/test-deps/meta.json
deleted file mode 100644
index 6aa438d25..000000000
--- a/release/7-1/fedora32/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "osVersion": "Fedora 32",
-    "tagTemplates": [
-        "fedora-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/7-1/nanoserver1809/docker/Dockerfile b/release/7-1/nanoserver1809/docker/Dockerfile
deleted file mode 100755
index d71105565..000000000
--- a/release/7-1/nanoserver1809/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1809
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver1809/meta.json b/release/7-1/nanoserver1809/meta.json
deleted file mode 100644
index f9dee969d..000000000
--- a/release/7-1/nanoserver1809/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1809",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/7-1/nanoserver1909/docker/Dockerfile b/release/7-1/nanoserver1909/docker/Dockerfile
deleted file mode 100644
index f46e57210..000000000
--- a/release/7-1/nanoserver1909/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1909"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver1909/meta.json b/release/7-1/nanoserver1909/meta.json
deleted file mode 100644
index 701d33bfd..000000000
--- a/release/7-1/nanoserver1909/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/nanoserver2004/docker/Dockerfile b/release/7-1/nanoserver2004/docker/Dockerfile
deleted file mode 100644
index e352e8f24..000000000
--- a/release/7-1/nanoserver2004/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-2004"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver2004/meta.json b/release/7-1/nanoserver2004/meta.json
deleted file mode 100644
index d10b78351..000000000
--- a/release/7-1/nanoserver2004/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/nanoserver2022/docker/Dockerfile b/release/7-1/nanoserver2022/docker/Dockerfile
deleted file mode 100644
index c91928b83..000000000
--- a/release/7-1/nanoserver2022/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG dockerHost=mcr.microsoft.com
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=windows/nanoserver
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver2022/meta.json b/release/7-1/nanoserver2022/meta.json
deleted file mode 100644
index af1db936a..000000000
--- a/release/7-1/nanoserver2022/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/nanoserver20H2/docker/Dockerfile b/release/7-1/nanoserver20H2/docker/Dockerfile
deleted file mode 100644
index db84868ed..000000000
--- a/release/7-1/nanoserver20H2/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/nanoserver20H2/meta.json b/release/7-1/nanoserver20H2/meta.json
deleted file mode 100644
index 02c16fb9d..000000000
--- a/release/7-1/nanoserver20H2/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-}
diff --git a/release/7-1/ubuntu16.04/docker/Dockerfile b/release/7-1/ubuntu16.04/docker/Dockerfile
deleted file mode 100644
index 3829808b9..000000000
--- a/release/7-1/ubuntu16.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM ubuntu:16.04 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu16.04/meta.json b/release/7-1/ubuntu16.04/meta.json
deleted file mode 100644
index 0e87f672b..000000000
--- a/release/7-1/ubuntu16.04/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#",
-        "ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "xenial"},
-        {"Tag": "16.04"}
-    ],
-    "SkipGssNtlmSspTests": false,
-    "TestProperties": {
-        "size": 395
-    },
-    "SubImage": "test-deps"
-}
diff --git a/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 6e8192a52..000000000
--- a/release/7-1/ubuntu16.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu16.04/test-deps/meta.json b/release/7-1/ubuntu16.04/test-deps/meta.json
deleted file mode 100644
index 8152d828e..000000000
--- a/release/7-1/ubuntu16.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 399
-    }
-}
diff --git a/release/7-1/ubuntu18.04/docker/Dockerfile b/release/7-1/ubuntu18.04/docker/Dockerfile
deleted file mode 100644
index 7a300024b..000000000
--- a/release/7-1/ubuntu18.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:18.04 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu18.04/meta.json b/release/7-1/ubuntu18.04/meta.json
deleted file mode 100644
index b57c000de..000000000
--- a/release/7-1/ubuntu18.04/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell_${PS_VERSION}-1.ubuntu.18.04_amd64.deb",
-    "osVersion": "Ubuntu 18.04",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#",
-        "ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps"
-}
diff --git a/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 47e76069d..000000000
--- a/release/7-1/ubuntu18.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu18.04/test-deps/meta.json b/release/7-1/ubuntu18.04/test-deps/meta.json
deleted file mode 100644
index 83453bb64..000000000
--- a/release/7-1/ubuntu18.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 18.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 358
-    }
-}
diff --git a/release/7-1/ubuntu20.04/docker/Dockerfile b/release/7-1/ubuntu20.04/docker/Dockerfile
deleted file mode 100644
index 1a831b710..000000000
--- a/release/7-1/ubuntu20.04/docker/Dockerfile
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:20.04 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.4
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ubuntu:20.04 AS powershell
-
-ARG PS_VERSION=7.1.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu66 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale
-
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu20.04/meta.json b/release/7-1/ubuntu20.04/meta.json
deleted file mode 100644
index fe47f3de2..000000000
--- a/release/7-1/ubuntu20.04/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Ubuntu 20.04",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#",
-        "ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "focal"},
-        {"Tag": "20.04"}
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps"
-}
diff --git a/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
deleted file mode 100644
index d9c7795a7..000000000
--- a/release/7-1/ubuntu20.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-1/ubuntu20.04/test-deps/meta.json b/release/7-1/ubuntu20.04/test-deps/meta.json
deleted file mode 100644
index b01cc7075..000000000
--- a/release/7-1/ubuntu20.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 20.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 358
-    }
-}
diff --git a/release/7-1/windowsserver2022/docker/Dockerfile b/release/7-1/windowsserver2022/docker/Dockerfile
deleted file mode 100644
index 88389cfe8..000000000
--- a/release/7-1/windowsserver2022/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG dockerHost=mcr.microsoft.com
-ARG WindowsServerRepo=windows/server
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServer
-FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsserver2022/meta.json b/release/7-1/windowsserver2022/meta.json
deleted file mode 100644
index b5738ca10..000000000
--- a/release/7-1/windowsserver2022/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsserver-#shorttag#",
-        "windowsserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "windowsserver"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/windowsservercore1909/docker/Dockerfile b/release/7-1/windowsservercore1909/docker/Dockerfile
deleted file mode 100644
index 354b9c209..000000000
--- a/release/7-1/windowsservercore1909/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:1909 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:1909
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-1909" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore1909/meta.json b/release/7-1/windowsservercore1909/meta.json
deleted file mode 100644
index 3637edbd2..000000000
--- a/release/7-1/windowsservercore1909/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 1909",
-    "shortTags": [
-        {
-            "Tag": "1909"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/windowsservercore2004/docker/Dockerfile b/release/7-1/windowsservercore2004/docker/Dockerfile
deleted file mode 100644
index 9c4a2f26a..000000000
--- a/release/7-1/windowsservercore2004/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:2004 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:2004
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-2004" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore2004/meta.json b/release/7-1/windowsservercore2004/meta.json
deleted file mode 100644
index 504d74601..000000000
--- a/release/7-1/windowsservercore2004/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 2004",
-    "shortTags": [
-        {
-            "Tag": "2004"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/windowsservercore2022/docker/Dockerfile b/release/7-1/windowsservercore2022/docker/Dockerfile
deleted file mode 100644
index 1a165d3e0..000000000
--- a/release/7-1/windowsservercore2022/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG dockerHost=mcr.microsoft.com
-ARG WindowsServerCoreRepo=windows/servercore
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore2022/meta.json b/release/7-1/windowsservercore2022/meta.json
deleted file mode 100644
index 71998ce09..000000000
--- a/release/7-1/windowsservercore2022/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "latest"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true
-}
diff --git a/release/7-1/windowsservercore20H2/docker/Dockerfile b/release/7-1/windowsservercore20H2/docker/Dockerfile
deleted file mode 100644
index 247cd3fef..000000000
--- a/release/7-1/windowsservercore20H2/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-1/windowsservercore20H2/meta.json b/release/7-1/windowsservercore20H2/meta.json
deleted file mode 100644
index b78fbb521..000000000
--- a/release/7-1/windowsservercore20H2/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-}
diff --git a/release/lts/arm32v7/docker/Dockerfile b/release/lts/arm32v7/docker/Dockerfile
deleted file mode 100644
index f03a9a6cf..000000000
--- a/release/lts/arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-FROM arm32v7/ubuntu:bionic AS installer-env
-
-
-ARG PS_VERSION=6.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-lts
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM arm32v7/ubuntu:bionic AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-lts
-ARG PS_VERSION=6.2.3
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh-lts symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/arm32v7/meta.json b/release/lts/arm32v7/meta.json
deleted file mode 100644
index d9b61729b..000000000
--- a/release/lts/arm32v7/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
-    "osVersion": "Ubuntu 18.04 ARM 32v7",
-    "SkipGssNtlmSspTests": true,
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "tagTemplates": [
-        "lts-arm32v7-ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"}
-    ],
-    "TestProperties": {
-        "size": 550,
-        "Arm32": true
-    },
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/debian10/dependabot/Dockerfile b/release/lts/debian10/dependabot/Dockerfile
deleted file mode 100644
index 505b9d83e..000000000
--- a/release/lts/debian10/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:10
diff --git a/release/lts/debian10/docker/Dockerfile b/release/lts/debian10/docker/Dockerfile
deleted file mode 100644
index 665417552..000000000
--- a/release/lts/debian10/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-lts
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.0.0
-ARG PS_INSTALL_VERSION=7-lts
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-lts
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu63 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh-lts symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian10/meta.json b/release/lts/debian10/meta.json
deleted file mode 100644
index a2b3877c6..000000000
--- a/release/lts/debian10/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 10",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "lts-debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "buster-slim"},
-        {"Tag": "10"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    },
-    "EndOfLife": "2024-06-01",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/lts/debian10/test-deps/docker/Dockerfile b/release/lts/debian10/test-deps/docker/Dockerfile
deleted file mode 100644
index 63bec0248..000000000
--- a/release/lts/debian10/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-10
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian10/test-deps/meta.json b/release/lts/debian10/test-deps/meta.json
deleted file mode 100644
index 48822372d..000000000
--- a/release/lts/debian10/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 10",
-    "tagTemplates": [
-        "lts-debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 316
-    }
-}
diff --git a/release/lts/debian11/dependabot/Dockerfile b/release/lts/debian11/dependabot/Dockerfile
deleted file mode 100644
index 6e90fb911..000000000
--- a/release/lts/debian11/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM debian:11
diff --git a/release/lts/debian11/docker/Dockerfile b/release/lts/debian11/docker/Dockerfile
deleted file mode 100644
index 75f6e8561..000000000
--- a/release/lts/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,94 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-FROM debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-lts
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
-
-ARG PS_VERSION=7.0.0
-ARG PS_INSTALL_VERSION=7-lts
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-lts
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh-lts symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian11/meta.json b/release/lts/debian11/meta.json
deleted file mode 100644
index c8a08a57b..000000000
--- a/release/lts/debian11/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "lts-debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    },
-    "EndOfLife": "2024-11-30",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/lts/debian11/test-deps/docker/Dockerfile b/release/lts/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index 96a8b9a38..000000000
--- a/release/lts/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/debian11/test-deps/meta.json b/release/lts/debian11/test-deps/meta.json
deleted file mode 100644
index 7ad958282..000000000
--- a/release/lts/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "lts-debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 332
-    }
-}
diff --git a/release/lts/nanoserver1809/docker/Dockerfile b/release/lts/nanoserver1809/docker/Dockerfile
deleted file mode 100755
index 5ef5c9979..000000000
--- a/release/lts/nanoserver1809/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:1809
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-1809"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver1809/meta.json b/release/lts/nanoserver1809/meta.json
deleted file mode 100644
index 839fb843e..000000000
--- a/release/lts/nanoserver1809/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 1809",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver-lts"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2024-01-09",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile
deleted file mode 100644
index c91928b83..000000000
--- a/release/lts/nanoserver2022/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG dockerHost=mcr.microsoft.com
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=windows/nanoserver
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-ltsc2022"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json
deleted file mode 100644
index ceb5d3ef4..000000000
--- a/release/lts/nanoserver2022/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "nanoserver-lts"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2024-11-30",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/nanoserver20H2/dependabot/Dockerfile b/release/lts/nanoserver20H2/dependabot/Dockerfile
deleted file mode 100644
index 2bb429d55..000000000
--- a/release/lts/nanoserver20H2/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM mcr.microsoft.com/windows/nanoserver:20H2
diff --git a/release/lts/nanoserver20H2/docker/Dockerfile b/release/lts/nanoserver20H2/docker/Dockerfile
deleted file mode 100644
index 777790924..000000000
--- a/release/lts/nanoserver20H2/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:20H2
-
-ARG IMAGE_NAME=mcr.microsoft.com/powershell
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/nanoserver20H2/meta.json b/release/lts/nanoserver20H2/meta.json
deleted file mode 100644
index 0fa59bda4..000000000
--- a/release/lts/nanoserver20H2/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "tagTemplates": [
-        "lts-nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/ubuntu16.04/docker/Dockerfile b/release/lts/ubuntu16.04/docker/Dockerfile
deleted file mode 100644
index 6cc556711..000000000
--- a/release/lts/ubuntu16.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM ubuntu:16.04 AS installer-env
-
-ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu16.04/meta.json b/release/lts/ubuntu16.04/meta.json
deleted file mode 100644
index 33909d5c2..000000000
--- a/release/lts/ubuntu16.04/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "lts-ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "xenial"},
-        {"Tag": "16.04"}
-    ],
-    "SkipGssNtlmSspTests": false,
-    "TestProperties": {
-        "size": 395
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2021-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile b/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 6e8192a52..000000000
--- a/release/lts/ubuntu16.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu16.04/test-deps/meta.json b/release/lts/ubuntu16.04/test-deps/meta.json
deleted file mode 100644
index 8bd139c7d..000000000
--- a/release/lts/ubuntu16.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "lts-ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 399
-    }
-}
diff --git a/release/lts/ubuntu18.04/dependabot/Dockerfile b/release/lts/ubuntu18.04/dependabot/Dockerfile
deleted file mode 100644
index 89783e07d..000000000
--- a/release/lts/ubuntu18.04/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM ubuntu:18.04
diff --git a/release/lts/ubuntu18.04/docker/Dockerfile b/release/lts/ubuntu18.04/docker/Dockerfile
deleted file mode 100644
index 96802b615..000000000
--- a/release/lts/ubuntu18.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:18.04 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/meta.json b/release/lts/ubuntu18.04/meta.json
deleted file mode 100644
index ec181e93a..000000000
--- a/release/lts/ubuntu18.04/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-lts_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 18.04",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "lts-ubuntu-#shorttag#"
-    ],
-    "manifestLists": [
-        "lts"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile b/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 47e76069d..000000000
--- a/release/lts/ubuntu18.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/lts/ubuntu18.04/test-deps/meta.json b/release/lts/ubuntu18.04/test-deps/meta.json
deleted file mode 100644
index 3e42dc92f..000000000
--- a/release/lts/ubuntu18.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 18.04",
-    "tagTemplates": [
-        "lts-ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 358
-    }
-}
diff --git a/release/lts/windowsserver2022/docker/Dockerfile b/release/lts/windowsserver2022/docker/Dockerfile
deleted file mode 100644
index 88389cfe8..000000000
--- a/release/lts/windowsserver2022/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG dockerHost=mcr.microsoft.com
-ARG WindowsServerRepo=windows/server
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServer
-FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsserver2022/meta.json b/release/lts/windowsserver2022/meta.json
deleted file mode 100644
index 3ea8a0241..000000000
--- a/release/lts/windowsserver2022/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsserver-#shorttag#"
-    ],
-    "manifestLists": [
-        "lts"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2024-11-30",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/windowsservercore2022/docker/Dockerfile b/release/lts/windowsservercore2022/docker/Dockerfile
deleted file mode 100644
index 1a165d3e0..000000000
--- a/release/lts/windowsservercore2022/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG dockerHost=mcr.microsoft.com
-ARG WindowsServerCoreRepo=windows/servercore
-ARG tag=ltsc2022
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json
deleted file mode 100644
index c582b088c..000000000
--- a/release/lts/windowsservercore2022/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, LTSC 2022",
-    "shortTags": [
-        {
-            "Tag": "ltsc2022"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#"
-    ],
-    "manifestLists": [
-        "lts"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2024-11-30",
-    "DistributionState": "Validated"
-}
diff --git a/release/lts/windowsservercore20H2/dependabot/Dockerfile b/release/lts/windowsservercore20H2/dependabot/Dockerfile
deleted file mode 100644
index b8c553b92..000000000
--- a/release/lts/windowsservercore20H2/dependabot/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-# Dummy docker image to trigger dependabot PRs
-
-FROM mcr.microsoft.com/windows/servercore:20H2
diff --git a/release/lts/windowsservercore20H2/docker/Dockerfile b/release/lts/windowsservercore20H2/docker/Dockerfile
deleted file mode 100644
index 15bf4270e..000000000
--- a/release/lts/windowsservercore20H2/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/lts/windowsservercore20H2/meta.json b/release/lts/windowsservercore20H2/meta.json
deleted file mode 100644
index 4765fd725..000000000
--- a/release/lts/windowsservercore20H2/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "lts-windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}
diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile
deleted file mode 100644
index 9d9a2b45a..000000000
--- a/release/servicing/centos7/docker/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=7
-ARG imageRepo=centos
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PACKAGE_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && yum install -y /tmp/powershell.rpm \
-    # Required for gssntlmssp
-    && yum install -y epel-release \
-    # Update now that we have epel-release
-    && yum update -y \
-    # Install libraries for NTLM support
-    && yum install -y \
-      gssntlmssp \
-      # less is required for help in powershell
-      less \
-      # PowerShell remoting over SSH dependencies
-      openssh-clients \
-    && yum upgrade-minimal -y --security \
-    && yum clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/servicing/centos7/meta.json b/release/servicing/centos7/meta.json
deleted file mode 100644
index 153fd5537..000000000
--- a/release/servicing/centos7/meta.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "CentOS 7",
-    "tagTemplates": [
-        "#psversion#-centos-#tag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 550
-    }
-}
diff --git a/release/servicing/debian9/docker/Dockerfile b/release/servicing/debian9/docker/Dockerfile
deleted file mode 100644
index 61247f190..000000000
--- a/release/servicing/debian9/docker/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch-slim
-ARG imageRepo=debian
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/servicing/debian9/meta.json b/release/servicing/debian9/meta.json
deleted file mode 100644
index eb96be443..000000000
--- a/release/servicing/debian9/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Debian 9",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#tag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    }
-}
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
deleted file mode 100755
index 4142c1c29..000000000
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG fromTag=1709
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=6.2.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:${fromTag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/servicing/nanoserver1809/meta.json b/release/servicing/nanoserver1809/meta.json
deleted file mode 100644
index 57494217f..000000000
--- a/release/servicing/nanoserver1809/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version ${fromTag}",
-    "shortTags": [
-        {
-            "Tag": "1809"
-        },
-        {
-            "Tag": "1903"
-        },
-        {
-            "Tag": "1909"
-        },
-        {
-            "Tag": "2004"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#tag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    }
-}
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
deleted file mode 100644
index fda993209..000000000
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Docker image file that describes an OpenSuse 42.3 image with PowerShell installed from tar.gz
-# Implemented in two stages, one that downloads and uncompresses the tar.gz
-# The next stage simply copies the files from the first stage,
-# effectively removing the tar.gz and packages that are not needed from the final image.
-
-# Define arg(s) needed for the From statement
-ARG fromTag=42.3
-ARG imageRepo=opensuse/leap
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=6
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive
-
-RUN zypper --non-interactive install \
-        tar
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# ------ Second stage ------
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:${fromTag}
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=6
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-
-# Install dependencies
-RUN zypper --non-interactive update --skip-interactive \
-    && zypper --non-interactive install \
-        glibc-locale \
-        glibc-i18ndata \
-        libicu \
-        openssl \
-        less \
-        # PowerShell remoting over SSH dependencies
-        openssh-clients \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # clean package manager cache
-    && zypper clean -a \
-    # remove package manager log file
-    && rm -f /var/log/zypp/history /var/log/zypper.log \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/servicing/opensuse423/meta.json b/release/servicing/opensuse423/meta.json
deleted file mode 100644
index 9c0b2783d..000000000
--- a/release/servicing/opensuse423/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "OpenSuse 42.3",
-    "SkipGssNtlmSspTests": true,
-    "tagTemplates": [
-        "#psversion#-opensuse-#tag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 524
-    }
-}
diff --git a/release/servicing/ubuntu16.04/docker/Dockerfile b/release/servicing/ubuntu16.04/docker/Dockerfile
deleted file mode 100644
index d513284a3..000000000
--- a/release/servicing/ubuntu16.04/docker/Dockerfile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=16.04
-ARG imageRepo=ubuntu
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/servicing/ubuntu16.04/meta.json b/release/servicing/ubuntu16.04/meta.json
deleted file mode 100644
index 1275c3fd1..000000000
--- a/release/servicing/ubuntu16.04/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "#psversion#-ubuntu-#tag#"
-    ],
-    "SkipGssNtlmSspTests": false,
-    "TestProperties": {
-        "size": 395
-    },
-    "SubImage": "test-deps"
-}
diff --git a/release/servicing/ubuntu18.04/docker/Dockerfile b/release/servicing/ubuntu18.04/docker/Dockerfile
deleted file mode 100644
index 2cf142f6d..000000000
--- a/release/servicing/ubuntu18.04/docker/Dockerfile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=18.04
-ARG imageRepo=ubuntu
-
-FROM ${imageRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/servicing/ubuntu18.04/meta.json b/release/servicing/ubuntu18.04/meta.json
deleted file mode 100644
index 4eb81b286..000000000
--- a/release/servicing/ubuntu18.04/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 18.04",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-ubuntu-#tag#"
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps"
-}
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
deleted file mode 100755
index 9269b7f9a..000000000
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG fromTag=latest
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:${fromTag} AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:${fromTag}
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/servicing/windowsservercore/meta.json b/release/servicing/windowsservercore/meta.json
deleted file mode 100644
index 9e81c4ab2..000000000
--- a/release/servicing/windowsservercore/meta.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version ${fromTag}",
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#tag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    }
-}

From a6494b5d00a986fc50678e8bf9cd8cd3d0a4a138 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 25 Apr 2022 13:21:34 -0400
Subject: [PATCH 186/354] Add support for Ubuntu22.04 (#633)

---
 release/7-2/ubuntu22.04/docker/Dockerfile     | 94 ++++++++++++++++++
 release/7-2/ubuntu22.04/meta.json             | 24 +++++
 .../ubuntu22.04/test-deps/docker/Dockerfile   | 21 ++++
 release/7-2/ubuntu22.04/test-deps/meta.json   | 16 ++++
 release/7-3/ubuntu22.04/docker/Dockerfile     | 96 +++++++++++++++++++
 release/7-3/ubuntu22.04/meta.json             | 23 +++++
 .../ubuntu22.04/test-deps/docker/Dockerfile   | 21 ++++
 release/7-3/ubuntu22.04/test-deps/meta.json   | 16 ++++
 8 files changed, 311 insertions(+)
 create mode 100644 release/7-2/ubuntu22.04/docker/Dockerfile
 create mode 100644 release/7-2/ubuntu22.04/meta.json
 create mode 100644 release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-2/ubuntu22.04/test-deps/meta.json
 create mode 100644 release/7-3/ubuntu22.04/docker/Dockerfile
 create mode 100644 release/7-3/ubuntu22.04/meta.json
 create mode 100644 release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/ubuntu22.04/test-deps/meta.json

diff --git a/release/7-2/ubuntu22.04/docker/Dockerfile b/release/7-2/ubuntu22.04/docker/Dockerfile
new file mode 100644
index 000000000..2b26d98f2
--- /dev/null
+++ b/release/7-2/ubuntu22.04/docker/Dockerfile
@@ -0,0 +1,94 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:22.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.2.2
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:22.04 AS powershell
+
+ARG PS_VERSION=7.2.2
+ARG PS_INSTALL_VERSION=7
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-22.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # required to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu70 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu22.04/meta.json b/release/7-2/ubuntu22.04/meta.json
new file mode 100644
index 000000000..dd7d450d3
--- /dev/null
+++ b/release/7-2/ubuntu22.04/meta.json
@@ -0,0 +1,24 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 22.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#",
+        "ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "manifestLists": [
+        "latest"
+    ],
+    "TestProperties": {
+        "size": 333
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2032-04-01",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..67b01c0ea
--- /dev/null
+++ b/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-22.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-22.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu22.04/test-deps/meta.json b/release/7-2/ubuntu22.04/test-deps/meta.json
new file mode 100644
index 000000000..affae6696
--- /dev/null
+++ b/release/7-2/ubuntu22.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 22.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 333
+    }
+}
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-3/ubuntu22.04/docker/Dockerfile
new file mode 100644
index 000000000..e6d63a659
--- /dev/null
+++ b/release/7-3/ubuntu22.04/docker/Dockerfile
@@ -0,0 +1,96 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:22.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:22.04 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu70 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
new file mode 100644
index 000000000..cb75153bd
--- /dev/null
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 22.04",
+    "SkipGssNtlmSspTests": false,
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "manifestLists": [
+        "preview"
+    ],
+    "TestProperties": {
+        "size": 334
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..67b01c0ea
--- /dev/null
+++ b/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-22.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-22.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/ubuntu22.04/test-deps/meta.json b/release/7-3/ubuntu22.04/test-deps/meta.json
new file mode 100644
index 000000000..10f649825
--- /dev/null
+++ b/release/7-3/ubuntu22.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 22.04",
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 334
+    }
+}

From a91971d4e74409283df80efa3b9985ef33707e03 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 29 Apr 2022 14:03:12 -0700
Subject: [PATCH 187/354] Add tags to matrix JSONs (#636)

* Add tags to matrix JSONs

* make taglist a matrix
---
 build.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.ps1 b/build.ps1
index 89ca8aa22..e225c1e16 100755
--- a/build.ps1
+++ b/build.ps1
@@ -603,6 +603,8 @@ End {
                                     EndOfLife         = $tag.EndOfLife
                                     DistributionState = $tag.DistributionState
                                     OsVersion         = $tag.OsVersion
+                                    # azDevOps doesn't support arrays
+                                    TagList           = $tag.Tags -join ';'
                                 })
                         }
                     }

From dfbec2cce359a987566e984181dee1f896237efa Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 2 May 2022 10:19:58 -0700
Subject: [PATCH 188/354] Require git and unzip in test-dep images (#637)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* require git and unzip

* update mariner

* remove ubi from private repo

* fix mariner size

* add git and unzip

* EOL 3.12

* fix mariner size

* remove extra space

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fix last error 🎉

* try again
---
 .vsts-ci/releaseStage.yml                     |  2 +-
 .../7-2/alpine313/test-deps/docker/Dockerfile |  4 +-
 .../7-2/alpine314/test-deps/docker/Dockerfile |  4 +-
 .../7-2/debian10/test-deps/docker/Dockerfile  |  2 +
 release/7-2/debian10/test-deps/meta.json      |  2 +-
 release/7-2/debian11/meta.json                |  2 +-
 .../7-2/debian11/test-deps/docker/Dockerfile  |  2 +
 release/7-2/debian11/test-deps/meta.json      |  2 +-
 .../7-2/debian9/test-deps/docker/Dockerfile   |  2 +
 release/7-2/debian9/test-deps/meta.json       |  2 +-
 .../7-2/fedora34/test-deps/docker/Dockerfile  |  2 +
 release/7-2/ubi84/meta.json                   |  1 -
 release/7-2/ubi84/test-deps/docker/Dockerfile |  2 +
 release/7-2/ubi84/test-deps/meta.json         |  3 +-
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +
 release/7-2/ubuntu16.04/test-deps/meta.json   |  2 +-
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +
 release/7-2/ubuntu18.04/test-deps/meta.json   |  2 +-
 .../ubuntu20.04/test-deps/docker/Dockerfile   |  2 +
 release/7-2/ubuntu20.04/test-deps/meta.json   |  2 +-
 release/7-2/ubuntu22.04/meta.json             |  2 +-
 .../ubuntu22.04/test-deps/docker/Dockerfile   |  2 +
 release/7-2/ubuntu22.04/test-deps/meta.json   |  2 +-
 release/7-3/alpine312/docker/Dockerfile       | 89 -------------------
 release/7-3/alpine312/meta.json               | 19 ----
 .../7-3/alpine312/test-deps/docker/Dockerfile | 38 --------
 release/7-3/alpine312/test-deps/meta.json     | 16 ----
 .../7-3/alpine313/test-deps/docker/Dockerfile |  4 +-
 .../7-3/alpine314/test-deps/docker/Dockerfile |  4 +-
 .../7-3/debian10/test-deps/docker/Dockerfile  |  8 +-
 .../7-3/debian11/test-deps/docker/Dockerfile  |  8 +-
 .../7-3/debian9/test-deps/docker/Dockerfile   |  8 +-
 .../7-3/fedora34/test-deps/docker/Dockerfile  |  2 +
 .../7-3/mariner1/test-deps/docker/Dockerfile  | 15 ++--
 release/7-3/mariner1/test-deps/meta.json      |  2 +-
 release/7-3/ubi84/meta.json                   |  1 -
 release/7-3/ubi84/test-deps/docker/Dockerfile |  2 +
 release/7-3/ubi84/test-deps/meta.json         |  1 -
 .../ubuntu16.04/test-deps/docker/Dockerfile   |  2 +
 .../ubuntu18.04/test-deps/docker/Dockerfile   |  2 +
 .../ubuntu20.04/test-deps/docker/Dockerfile   |  2 +
 .../ubuntu22.04/test-deps/docker/Dockerfile   |  8 +-
 release/7-3/ubuntu22.04/test-deps/meta.json   |  2 +-
 .../amazonlinux/test-deps/docker/Dockerfile   |  2 +
 tests/container.tests.ps1                     |  4 +-
 45 files changed, 86 insertions(+), 203 deletions(-)
 delete mode 100644 release/7-3/alpine312/docker/Dockerfile
 delete mode 100644 release/7-3/alpine312/meta.json
 delete mode 100644 release/7-3/alpine312/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/alpine312/test-deps/meta.json

diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 740dc9773..3fa558cc1 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -24,7 +24,7 @@ stages:
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
-          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter ${{ parameters.osFilter }}
         displayName: Generate Matrix YAML
         condition: succeededOrFailed()
         name: matrix
diff --git a/release/7-2/alpine313/test-deps/docker/Dockerfile b/release/7-2/alpine313/test-deps/docker/Dockerfile
index 02d7b1b60..fa53b84db 100644
--- a/release/7-2/alpine313/test-deps/docker/Dockerfile
+++ b/release/7-2/alpine313/test-deps/docker/Dockerfile
@@ -21,12 +21,14 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
 COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
 
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
+    && apk add  --no-cache \
         bash \
         sudo \
         shadow \
         openssl \
         curl \
+        git \
+        unzip \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-2/alpine314/test-deps/docker/Dockerfile b/release/7-2/alpine314/test-deps/docker/Dockerfile
index 7abedb0b2..5cdcf9e0b 100644
--- a/release/7-2/alpine314/test-deps/docker/Dockerfile
+++ b/release/7-2/alpine314/test-deps/docker/Dockerfile
@@ -21,12 +21,14 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
 COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
 
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
+    && apk add  --no-cache \
     bash \
     sudo \
     shadow \
     openssl \
     curl \
+    git \
+    unzip \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-2/debian10/test-deps/docker/Dockerfile b/release/7-2/debian10/test-deps/docker/Dockerfile
index 63bec0248..9089a3170 100644
--- a/release/7-2/debian10/test-deps/docker/Dockerfile
+++ b/release/7-2/debian10/test-deps/docker/Dockerfile
@@ -12,6 +12,8 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/debian10/test-deps/meta.json b/release/7-2/debian10/test-deps/meta.json
index 36de679e8..18ca89678 100644
--- a/release/7-2/debian10/test-deps/meta.json
+++ b/release/7-2/debian10/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 390
     }
 }
diff --git a/release/7-2/debian11/meta.json b/release/7-2/debian11/meta.json
index 31c8d6614..82630dfb5 100644
--- a/release/7-2/debian11/meta.json
+++ b/release/7-2/debian11/meta.json
@@ -14,7 +14,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 350
+        "size": 400
     },
     "EndOfLife": "2024-11-30",
     "DistributionState": "Validated"
diff --git a/release/7-2/debian11/test-deps/docker/Dockerfile b/release/7-2/debian11/test-deps/docker/Dockerfile
index 96a8b9a38..bac40e64c 100644
--- a/release/7-2/debian11/test-deps/docker/Dockerfile
+++ b/release/7-2/debian11/test-deps/docker/Dockerfile
@@ -12,6 +12,8 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/debian11/test-deps/meta.json b/release/7-2/debian11/test-deps/meta.json
index 424e8a54f..397669627 100644
--- a/release/7-2/debian11/test-deps/meta.json
+++ b/release/7-2/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 350
+        "size": 400
     }
 }
diff --git a/release/7-2/debian9/test-deps/docker/Dockerfile b/release/7-2/debian9/test-deps/docker/Dockerfile
index 7ab3f2e17..4810ee352 100644
--- a/release/7-2/debian9/test-deps/docker/Dockerfile
+++ b/release/7-2/debian9/test-deps/docker/Dockerfile
@@ -12,6 +12,8 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/debian9/test-deps/meta.json b/release/7-2/debian9/test-deps/meta.json
index 79d8a0610..e9fb75b19 100644
--- a/release/7-2/debian9/test-deps/meta.json
+++ b/release/7-2/debian9/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 370
     }
 }
diff --git a/release/7-2/fedora34/test-deps/docker/Dockerfile b/release/7-2/fedora34/test-deps/docker/Dockerfile
index 1d3a28fc4..b6b41b8d7 100644
--- a/release/7-2/fedora34/test-deps/docker/Dockerfile
+++ b/release/7-2/fedora34/test-deps/docker/Dockerfile
@@ -12,6 +12,8 @@ RUN dnf install -y \
         iputils \
         procps \
         findutils \
+        unzip \
+        git \
     && dnf clean all
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
diff --git a/release/7-2/ubi84/meta.json b/release/7-2/ubi84/meta.json
index 0c6fbf926..56fe3af28 100644
--- a/release/7-2/ubi84/meta.json
+++ b/release/7-2/ubi84/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Universal Base Image 8.4",
-    "FullRepository": "powershell/rhel",
     "tagTemplates": [
         "#psversion#-ubi-#shorttag#",
         "ubi-#shorttag#"
diff --git a/release/7-2/ubi84/test-deps/docker/Dockerfile b/release/7-2/ubi84/test-deps/docker/Dockerfile
index 93b5a5f62..c51396080 100644
--- a/release/7-2/ubi84/test-deps/docker/Dockerfile
+++ b/release/7-2/ubi84/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN yum install -y \
         hostname \
         iputils \
         procps-ng \
+        git \
+        unzip \
     && yum clean all \
     && rm -rf /var/cache/yum
 
diff --git a/release/7-2/ubi84/test-deps/meta.json b/release/7-2/ubi84/test-deps/meta.json
index 408f5074c..7818d9d3b 100644
--- a/release/7-2/ubi84/test-deps/meta.json
+++ b/release/7-2/ubi84/test-deps/meta.json
@@ -10,12 +10,11 @@
         "#psversion#-ubi-#shorttag#",
         "ubi-#shorttag#"
     ],
-    "FullRepository": "powershell/rhel/test-deps",
     "OptionalTests": [
         "test-deps"
     ],
     "TestProperties": {
-        "size": 750
+        "size": 788
     },
     "DistributionState": "Validating",
     "EndOfLife": "2023-05-30"
diff --git a/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
index 6e8192a52..38baf4444 100644
--- a/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/ubuntu16.04/test-deps/meta.json b/release/7-2/ubuntu16.04/test-deps/meta.json
index 8152d828e..b28a47542 100644
--- a/release/7-2/ubuntu16.04/test-deps/meta.json
+++ b/release/7-2/ubuntu16.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 399
+        "size": 436
     }
 }
diff --git a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
index 47e76069d..c8e9e805a 100644
--- a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/ubuntu18.04/test-deps/meta.json b/release/7-2/ubuntu18.04/test-deps/meta.json
index 83453bb64..f1002d00c 100644
--- a/release/7-2/ubuntu18.04/test-deps/meta.json
+++ b/release/7-2/ubuntu18.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 358
+        "size": 380
     }
 }
diff --git a/release/7-2/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu20.04/test-deps/docker/Dockerfile
index d9c7795a7..bf15fd900 100644
--- a/release/7-2/ubuntu20.04/test-deps/docker/Dockerfile
+++ b/release/7-2/ubuntu20.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/ubuntu20.04/test-deps/meta.json b/release/7-2/ubuntu20.04/test-deps/meta.json
index b01cc7075..f8b2b7f62 100644
--- a/release/7-2/ubuntu20.04/test-deps/meta.json
+++ b/release/7-2/ubuntu20.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 358
+        "size": 406
     }
 }
diff --git a/release/7-2/ubuntu22.04/meta.json b/release/7-2/ubuntu22.04/meta.json
index dd7d450d3..328ab073d 100644
--- a/release/7-2/ubuntu22.04/meta.json
+++ b/release/7-2/ubuntu22.04/meta.json
@@ -16,7 +16,7 @@
         "latest"
     ],
     "TestProperties": {
-        "size": 333
+        "size": 390
     },
     "SubImage": "test-deps",
     "EndOfLife": "2032-04-01",
diff --git a/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
index 67b01c0ea..d063352f9 100644
--- a/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
+++ b/release/7-2/ubuntu22.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-2/ubuntu22.04/test-deps/meta.json b/release/7-2/ubuntu22.04/test-deps/meta.json
index affae6696..c488d53c1 100644
--- a/release/7-2/ubuntu22.04/test-deps/meta.json
+++ b/release/7-2/ubuntu22.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 333
+        "size": 390
     }
 }
diff --git a/release/7-3/alpine312/docker/Dockerfile b/release/7-3/alpine312/docker/Dockerfile
deleted file mode 100644
index 174fa19db..000000000
--- a/release/7-3/alpine312/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.12 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.12 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.12
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.12
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine312/meta.json b/release/7-3/alpine312/meta.json
deleted file mode 100644
index e1bd2beed..000000000
--- a/release/7-3/alpine312/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.12"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 230
-    },
-    "EndOfLife": "2022-05-01",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/alpine312/test-deps/docker/Dockerfile b/release/7-3/alpine312/test-deps/docker/Dockerfile
deleted file mode 100644
index 3d65429f0..000000000
--- a/release/7-3/alpine312/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.12
-
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.12
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine312/test-deps/meta.json b/release/7-3/alpine312/test-deps/meta.json
deleted file mode 100644
index f5c0bf2a6..000000000
--- a/release/7-3/alpine312/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.12",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 315
-    }
-}
diff --git a/release/7-3/alpine313/test-deps/docker/Dockerfile b/release/7-3/alpine313/test-deps/docker/Dockerfile
index 02d7b1b60..54468a34d 100644
--- a/release/7-3/alpine313/test-deps/docker/Dockerfile
+++ b/release/7-3/alpine313/test-deps/docker/Dockerfile
@@ -21,12 +21,14 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
 COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
 
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
+    && apk add --no-cache  \
         bash \
         sudo \
         shadow \
         openssl \
         curl \
+        git \
+        unzip \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-3/alpine314/test-deps/docker/Dockerfile b/release/7-3/alpine314/test-deps/docker/Dockerfile
index 7abedb0b2..d3d180bc6 100644
--- a/release/7-3/alpine314/test-deps/docker/Dockerfile
+++ b/release/7-3/alpine314/test-deps/docker/Dockerfile
@@ -21,12 +21,14 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
 COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
 
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add \
+    && apk add --no-cache \
     bash \
     sudo \
     shadow \
     openssl \
     curl \
+    git \
+    unzip \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-3/debian10/test-deps/docker/Dockerfile b/release/7-3/debian10/test-deps/docker/Dockerfile
index 614166526..278df8978 100644
--- a/release/7-3/debian10/test-deps/docker/Dockerfile
+++ b/release/7-3/debian10/test-deps/docker/Dockerfile
@@ -4,7 +4,8 @@ ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-10
 FROM ${BaseImage}
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
     && apt-get install --no-install-recommends -y \
         sudo \
         curl \
@@ -12,8 +13,9 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+        git \
+        unzip \
+    && apt-get clean
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
 
diff --git a/release/7-3/debian11/test-deps/docker/Dockerfile b/release/7-3/debian11/test-deps/docker/Dockerfile
index e3ee94ddc..a87eee790 100644
--- a/release/7-3/debian11/test-deps/docker/Dockerfile
+++ b/release/7-3/debian11/test-deps/docker/Dockerfile
@@ -4,7 +4,8 @@ ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
 FROM ${BaseImage}
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
     && apt-get install --no-install-recommends -y \
         sudo \
         curl \
@@ -12,8 +13,9 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+        git \
+        unzip \
+    && apt-get clean
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
 
diff --git a/release/7-3/debian9/test-deps/docker/Dockerfile b/release/7-3/debian9/test-deps/docker/Dockerfile
index 7ab3f2e17..af307292e 100644
--- a/release/7-3/debian9/test-deps/docker/Dockerfile
+++ b/release/7-3/debian9/test-deps/docker/Dockerfile
@@ -4,7 +4,8 @@ ARG BaseImage=mcr.microsoft.com/powershell:debian-9
 FROM ${BaseImage}
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
     && apt-get install --no-install-recommends -y \
         sudo \
         curl \
@@ -12,8 +13,9 @@ RUN apt-get update \
         iputils-ping \
         iputils-tracepath \
         procps \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+        git \
+        unzip \
+    && apt-get clean
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
 
diff --git a/release/7-3/fedora34/test-deps/docker/Dockerfile b/release/7-3/fedora34/test-deps/docker/Dockerfile
index c0ff6363c..a4402242a 100644
--- a/release/7-3/fedora34/test-deps/docker/Dockerfile
+++ b/release/7-3/fedora34/test-deps/docker/Dockerfile
@@ -12,6 +12,8 @@ RUN dnf install -y \
         iputils \
         procps \
         findutils \
+        unzip \
+        git \
     && dnf clean all
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
diff --git a/release/7-3/mariner1/test-deps/docker/Dockerfile b/release/7-3/mariner1/test-deps/docker/Dockerfile
index fef76545d..481365ea8 100644
--- a/release/7-3/mariner1/test-deps/docker/Dockerfile
+++ b/release/7-3/mariner1/test-deps/docker/Dockerfile
@@ -3,13 +3,14 @@ ARG BaseImage=mcr.microsoft.com/powershell:mariner
 FROM ${BaseImage}
 
 # To find which package provides a particular command, run:
-# yum install dnf-utils
+# tdnf install dnf-utils
 # dnf provides <command>
 
 # Install dependencies and clean up
-RUN yum update -y \
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
     # install dependencies
-    && yum install -y \
+    && tdnf install -y \
     dnf-utils \
     sudo \
     curl \
@@ -18,12 +19,12 @@ RUN yum update -y \
     iputils \
     # provides ps
     procps-ng \
+    unzip \
+    git \
     # upgrade packages
-    && yum upgrade -y \
+    && tdnf upgrade -y \
     # clean cached data
-    && yum clean all \
-    # remove cache folders and files
-    && rm -rf /var/cache/yum
+    && tdnf clean all
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
 
diff --git a/release/7-3/mariner1/test-deps/meta.json b/release/7-3/mariner1/test-deps/meta.json
index 1840e5156..4ad96384f 100644
--- a/release/7-3/mariner1/test-deps/meta.json
+++ b/release/7-3/mariner1/test-deps/meta.json
@@ -12,6 +12,6 @@
         "test-deps-redhat"
     ],
     "TestProperties": {
-        "size": 422
+        "size": 544
     }
 }
diff --git a/release/7-3/ubi84/meta.json b/release/7-3/ubi84/meta.json
index 0f60875e3..559a74e53 100644
--- a/release/7-3/ubi84/meta.json
+++ b/release/7-3/ubi84/meta.json
@@ -4,7 +4,6 @@
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Universal Base Image 8.4",
-    "FullRepository": "powershell/rhel",
     "tagTemplates": [
         "preview-ubi-#shorttag#"
     ],
diff --git a/release/7-3/ubi84/test-deps/docker/Dockerfile b/release/7-3/ubi84/test-deps/docker/Dockerfile
index 93b5a5f62..c51396080 100644
--- a/release/7-3/ubi84/test-deps/docker/Dockerfile
+++ b/release/7-3/ubi84/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN yum install -y \
         hostname \
         iputils \
         procps-ng \
+        git \
+        unzip \
     && yum clean all \
     && rm -rf /var/cache/yum
 
diff --git a/release/7-3/ubi84/test-deps/meta.json b/release/7-3/ubi84/test-deps/meta.json
index 73dcbdbe8..7996a5edc 100644
--- a/release/7-3/ubi84/test-deps/meta.json
+++ b/release/7-3/ubi84/test-deps/meta.json
@@ -9,7 +9,6 @@
     "tagTemplates": [
         "preview-ubi-#shorttag#"
     ],
-    "FullRepository": "powershell/rhel/test-deps",
     "OptionalTests": [
         "test-deps"
     ],
diff --git a/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
index 09481ed6f..4299f3a38 100644
--- a/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
+++ b/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
index 47e76069d..c8e9e805a 100644
--- a/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
+++ b/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
index d9c7795a7..bf15fd900 100644
--- a/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
+++ b/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update \
         wget \
         iputils-ping \
         iputils-tracepath \
+        git \
+        unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
index 67b01c0ea..46f14f92a 100644
--- a/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
+++ b/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
@@ -4,15 +4,17 @@ ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-22.04
 FROM ${BaseImage}
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
     && apt-get install --no-install-recommends -y \
         sudo \
         curl \
         wget \
         iputils-ping \
         iputils-tracepath \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+        git \
+        unzip \
+    && apt-get clean
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-22.04
 
diff --git a/release/7-3/ubuntu22.04/test-deps/meta.json b/release/7-3/ubuntu22.04/test-deps/meta.json
index 10f649825..735f5e9d0 100644
--- a/release/7-3/ubuntu22.04/test-deps/meta.json
+++ b/release/7-3/ubuntu22.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 334
+        "size": 390
     }
 }
diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
index 3dbc2a077..0a6ccfdaa 100644
--- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
+++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile
@@ -24,6 +24,8 @@ RUN \
       wget \
       openssl \
       tar \
+      unzip \
+      git \
     && yum clean all \
     # remove cache folders and files
     && rm -rf /var/cache/yum
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index d70b027d6..f1ad8bbce 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -479,14 +479,16 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 @{command = 'bash'}
                 @{command = 'curl'}
                 @{command = 'find'}
+                @{command = 'git'}
                 @{command = 'hostname'}
+                @{command = 'openssl'}
                 @{command = 'ping'}
                 @{command = 'ps'}
                 @{command = 'su'}
                 @{command = 'sudo'}
                 @{command = 'tar'}
+                @{command = 'unzip'}
                 @{command = 'wget'}
-                @{command = 'openssl'}
             )
 
             $debianCommands = @(

From e6a44d417aa78c6aa55875cb35b7c79891f386f6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 10:22:51 -0700
Subject: [PATCH 189/354] Update the release build yaml with the latest
 versions (#634)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index fced19fd7..d04efa1cf 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.3.0-preview.3'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.2'
+    default: 'v7.2.3'
   - name: 'stableReleaseTag'
-    default: 'v7.2.2'
+    default: 'v7.2.3'
 
 resources:
 - repo: self

From 2cf7d865ae9fff94ed5c1d637d5762adc73248c9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 2 May 2022 15:01:56 -0700
Subject: [PATCH 190/354] Use ACR for all windows Images (#638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* switch windows CI image to 2022

* switch 2022 images it to run in CI

* We use a mix of OS to test and build so this is not possible 🤷🏼‍♂️
---
 .vsts-ci/stage.yml                   | 2 +-
 release/7-2/nanoserver1809/meta.json | 2 +-
 release/7-3/nanoserver1809/meta.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index 38c341425..721c561d0 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -39,6 +39,6 @@ stages:
         matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
         dependsOn: GenerateYaml_${{ variables.jobName }}
         jobName: Build_Win
-        vmImage: windows-2019
+        vmImage: windows-2022
         ciParameter: ${{ parameters.winCiParameter }}
         useacr: ${{ parameters.useacr }}
diff --git a/release/7-2/nanoserver1809/meta.json b/release/7-2/nanoserver1809/meta.json
index d78a1c88d..b4fa7370d 100644
--- a/release/7-2/nanoserver1809/meta.json
+++ b/release/7-2/nanoserver1809/meta.json
@@ -18,7 +18,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": false,
+    "UseAcr": true,
     "EndOfLife": "2024-01-09",
     "DistributionState": "Validated"
 }
diff --git a/release/7-3/nanoserver1809/meta.json b/release/7-3/nanoserver1809/meta.json
index 680966092..1eb5a6687 100644
--- a/release/7-3/nanoserver1809/meta.json
+++ b/release/7-3/nanoserver1809/meta.json
@@ -14,7 +14,7 @@
     "TestProperties": {
         "size": 1
     },
-    "UseAcr": false,
+    "UseAcr": true,
     "EndOfLife": "2023-12-15",
     "DistributionState": "Validated"
 }

From 36170b8ae952709f05980657512ba54c6c9bf976 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 5 May 2022 18:16:34 -0400
Subject: [PATCH 191/354] Ubi 8.4 image should have Version_ID of 8.4 (#642)

* remove yum update call which updates ubi 8.4 version ID to 8.5

* remove typo

* remove security upgrade
---
 release/7-2/ubi84/docker/Dockerfile | 7 ++-----
 release/7-3/ubi84/docker/Dockerfile | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/release/7-2/ubi84/docker/Dockerfile b/release/7-2/ubi84/docker/Dockerfile
index 42ed265e1..16d179d54 100644
--- a/release/7-2/ubi84/docker/Dockerfile
+++ b/release/7-2/ubi84/docker/Dockerfile
@@ -15,20 +15,17 @@ ARG PS_VERSION=7.2.2
 ARG PS_INSTALL_VERSION=7
 
 RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum update -y \
-    && yum install -y \
+    yum install -y \
       less \
       ncurses \
       openssh-clients \
       glibc-locale-source \
       glibc-langpack-en \
       libicu \
-    && yum upgrade-minimal -y --security \
     && yum clean all
 RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum update -y \
-    && yum localinstall -y \
+    yum localinstall -y \
       /mnt/rpm/linux.rpm \
     && yum upgrade-minimal -y --security \
     && yum clean all
diff --git a/release/7-3/ubi84/docker/Dockerfile b/release/7-3/ubi84/docker/Dockerfile
index 31c3ab7a2..bcf97336e 100644
--- a/release/7-3/ubi84/docker/Dockerfile
+++ b/release/7-3/ubi84/docker/Dockerfile
@@ -16,20 +16,17 @@ ARG PS_VERSION=7.3.0-preview.1
 ARG PS_INSTALL_VERSION=7-preview
 
 RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum update -y \
-    && yum install -y \
+    yum install -y \
       less \
       ncurses \
       openssh-clients \
       glibc-locale-source \
       glibc-langpack-en \
       libicu \
-    && yum upgrade-minimal -y --security \
     && yum clean all
 RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum update -y \
-    && yum localinstall -y \
+    yum localinstall -y \
       /mnt/rpm/linux.rpm \
     && yum upgrade-minimal -y --security \
     && yum clean all

From 619aef6069ff1e929fbcb22a5f18d60b13bc2883 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 5 May 2022 15:28:30 -0700
Subject: [PATCH 192/354] Add mariner 2.0 images (#639)

* add stable mariner1 image

* add mariner2 image

* make sure we load the right pester

* use tag prefix for preview channel to make json's more portable

* add comment on distro state to osversion

* finish adding mariner2

* fix reference sizes

* Update release/7-2/mariner2/docker/Dockerfile

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>

* Update release/7-2/mariner2/docker/Dockerfile

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
---
 release/7-2/mariner1/docker/Dockerfile        | 87 +++++++++++++++++++
 release/7-2/mariner1/meta.json                | 19 ++++
 .../7-2/mariner1/test-deps/docker/Dockerfile  | 33 +++++++
 release/7-2/mariner1/test-deps/meta.json      | 17 ++++
 release/7-2/mariner2/docker/Dockerfile        | 87 +++++++++++++++++++
 release/7-2/mariner2/meta.json                | 16 ++++
 .../7-2/mariner2/test-deps/docker/Dockerfile  | 33 +++++++
 release/7-2/mariner2/test-deps/meta.json      | 17 ++++
 release/7-3/alpine313/meta.json               |  4 +-
 release/7-3/alpine313/test-deps/meta.json     |  2 +-
 release/7-3/alpine314/meta.json               |  4 +-
 release/7-3/alpine314/test-deps/meta.json     |  2 +-
 release/7-3/arm32v7/meta.json                 |  4 +-
 release/7-3/debian10/meta.json                |  4 +-
 release/7-3/debian10/test-deps/meta.json      |  2 +-
 release/7-3/debian11/meta.json                |  4 +-
 release/7-3/debian11/test-deps/meta.json      |  2 +-
 release/7-3/debian9/meta.json                 |  4 +-
 release/7-3/debian9/test-deps/meta.json       |  2 +-
 release/7-3/fedora34/meta.json                |  4 +-
 release/7-3/fedora34/test-deps/meta.json      |  2 +-
 release/7-3/mariner1/meta.json                |  4 +-
 release/7-3/mariner1/test-deps/meta.json      |  2 +-
 release/7-3/mariner2/docker/Dockerfile        | 87 +++++++++++++++++++
 release/7-3/mariner2/meta.json                | 16 ++++
 .../7-3/mariner2/test-deps/docker/Dockerfile  | 33 +++++++
 release/7-3/mariner2/test-deps/meta.json      | 17 ++++
 release/7-3/nanoserver1809/meta.json          |  4 +-
 release/7-3/nanoserver2022/meta.json          |  6 +-
 release/7-3/nanoserver20H2/meta.json          |  4 +-
 release/7-3/ubi84/meta.json                   |  4 +-
 release/7-3/ubi84/test-deps/meta.json         |  2 +-
 release/7-3/ubuntu16.04/meta.json             |  4 +-
 release/7-3/ubuntu16.04/test-deps/meta.json   |  2 +-
 release/7-3/ubuntu18.04/meta.json             |  4 +-
 release/7-3/ubuntu18.04/test-deps/meta.json   |  2 +-
 release/7-3/ubuntu20.04/meta.json             |  4 +-
 release/7-3/ubuntu20.04/test-deps/meta.json   |  2 +-
 release/7-3/ubuntu22.04/meta.json             |  4 +-
 release/7-3/ubuntu22.04/test-deps/meta.json   |  2 +-
 release/7-3/windowsserver2022/meta.json       |  6 +-
 release/7-3/windowsservercore2022/meta.json   |  4 +-
 release/7-3/windowsservercore20H2/meta.json   |  4 +-
 tools/buildHelper/buildHelper.psm1            | 30 ++++++-
 tools/buildHelper/channels.json               |  1 +
 45 files changed, 524 insertions(+), 73 deletions(-)
 create mode 100644 release/7-2/mariner1/docker/Dockerfile
 create mode 100644 release/7-2/mariner1/meta.json
 create mode 100644 release/7-2/mariner1/test-deps/docker/Dockerfile
 create mode 100644 release/7-2/mariner1/test-deps/meta.json
 create mode 100644 release/7-2/mariner2/docker/Dockerfile
 create mode 100644 release/7-2/mariner2/meta.json
 create mode 100644 release/7-2/mariner2/test-deps/docker/Dockerfile
 create mode 100644 release/7-2/mariner2/test-deps/meta.json
 create mode 100644 release/7-3/mariner2/docker/Dockerfile
 create mode 100644 release/7-3/mariner2/meta.json
 create mode 100644 release/7-3/mariner2/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/mariner2/test-deps/meta.json

diff --git a/release/7-2/mariner1/docker/Dockerfile b/release/7-2/mariner1/docker/Dockerfile
new file mode 100644
index 000000000..1fb7a02fd
--- /dev/null
+++ b/release/7-2/mariner1/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
+
+# Install dependencies and clean up
+RUN tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    # required for localization
+    icu \
+    # required for help in PowerShell
+    less \
+    # required for SSH
+    openssh-clients \
+    ca-certificates \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all \
+    # remove cache folders and files
+    && rm -rf /var/cache/yum
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-2/mariner1/meta.json b/release/7-2/mariner1/meta.json
new file mode 100644
index 000000000..dbbf6cd07
--- /dev/null
+++ b/release/7-2/mariner1/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 1.0",
+    "shortTags": [
+        {"Tag": "1.0"}
+    ],
+    "tagTemplates": [
+        "mariner-#shorttag#",
+        "#psversion#-mariner-#shorttag#"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 610
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-2/mariner1/test-deps/docker/Dockerfile b/release/7-2/mariner1/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..481365ea8
--- /dev/null
+++ b/release/7-2/mariner1/test-deps/docker/Dockerfile
@@ -0,0 +1,33 @@
+# Docker image file that describes an Mariner image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:mariner
+FROM ${BaseImage}
+
+# To find which package provides a particular command, run:
+# tdnf install dnf-utils
+# dnf provides <command>
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    dnf-utils \
+    sudo \
+    curl \
+    wget \
+    # provides ping and trace path
+    iputils \
+    # provides ps
+    procps-ng \
+    unzip \
+    git \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/mariner1/test-deps/meta.json b/release/7-2/mariner1/test-deps/meta.json
new file mode 100644
index 000000000..fe2b357e5
--- /dev/null
+++ b/release/7-2/mariner1/test-deps/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 1.0",
+    "tagTemplates": [
+        "mariner-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-redhat"
+    ],
+    "TestProperties": {
+        "size": 610
+    }
+}
diff --git a/release/7-2/mariner2/docker/Dockerfile b/release/7-2/mariner2/docker/Dockerfile
new file mode 100644
index 000000000..bcba6ea4e
--- /dev/null
+++ b/release/7-2/mariner2/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM cblmariner2preview.azurecr.io/base/core:2.0 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.2.3
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+# Install dependencies and clean up
+RUN tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    # required for localization
+    icu \
+    # required for help in PowerShell
+    less \
+    # required for SSH
+    openssh-clients \
+    ca-certificates \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all \
+    # remove cache folders and files
+    && rm -rf /var/cache/yum
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/mariner2/meta.json b/release/7-2/mariner2/meta.json
new file mode 100644
index 000000000..792ad0f10
--- /dev/null
+++ b/release/7-2/mariner2/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0 (Beta)",
+    "shortTags": [
+        {"Tag": "2.0"}
+    ],
+    "ShortDistroName": "mariner",
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 450
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..86fc72dc7
--- /dev/null
+++ b/release/7-2/mariner2/test-deps/docker/Dockerfile
@@ -0,0 +1,33 @@
+# Docker image file that describes an Mariner image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:mariner
+FROM ${BaseImage}
+
+# To find which package provides a particular command, run:
+# tdnf install dnf-utils
+# dnf provides <command>
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    dnf-utils \
+    sudo \
+    curl \
+    wget \
+    # provides ping and trace path
+    iputils \
+    # provides ps
+    procps-ng \
+    unzip \
+    git \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/mariner2/test-deps/meta.json b/release/7-2/mariner2/test-deps/meta.json
new file mode 100644
index 000000000..e1e5267ee
--- /dev/null
+++ b/release/7-2/mariner2/test-deps/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0 (Beta)",
+    "tagTemplates": [
+        "mariner-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-redhat"
+    ],
+    "TestProperties": {
+        "size": 610
+    }
+}
diff --git a/release/7-3/alpine313/meta.json b/release/7-3/alpine313/meta.json
index 021767a8b..4b386a3aa 100644
--- a/release/7-3/alpine313/meta.json
+++ b/release/7-3/alpine313/meta.json
@@ -3,9 +3,7 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
+    "ShortDistroName": "alpine",
     "shortTags": [
         {"Tag": "3.13"}
     ],
diff --git a/release/7-3/alpine313/test-deps/meta.json b/release/7-3/alpine313/test-deps/meta.json
index 2c4f23f5e..00007c0fd 100644
--- a/release/7-3/alpine313/test-deps/meta.json
+++ b/release/7-3/alpine313/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.13",
     "tagTemplates": [
-        "preview-alpine-#shorttag#"
+        "alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
diff --git a/release/7-3/alpine314/meta.json b/release/7-3/alpine314/meta.json
index a556e0a08..99aab3d1f 100644
--- a/release/7-3/alpine314/meta.json
+++ b/release/7-3/alpine314/meta.json
@@ -3,9 +3,7 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
     "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "preview-alpine-#shorttag#"
-    ],
+    "shortDistroName": "alpine",
     "shortTags": [
         {"Tag": "3.14"}
     ],
diff --git a/release/7-3/alpine314/test-deps/meta.json b/release/7-3/alpine314/test-deps/meta.json
index dc64b7d78..f71e6eac6 100644
--- a/release/7-3/alpine314/test-deps/meta.json
+++ b/release/7-3/alpine314/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Alpine 3.14",
     "tagTemplates": [
-        "preview-alpine-#shorttag#"
+        "alpine-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps",
diff --git a/release/7-3/arm32v7/meta.json b/release/7-3/arm32v7/meta.json
index ff62cf6fe..f9330dce3 100644
--- a/release/7-3/arm32v7/meta.json
+++ b/release/7-3/arm32v7/meta.json
@@ -6,9 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
-    "tagTemplates": [
-        "preview-arm32v7-ubuntu-#shorttag#"
-    ],
+    "ShortDistroName": "arm32v7-ubuntu",
     "shortTags": [
         {"Tag": "bionic"},
         {"Tag": "18.04"}
diff --git a/release/7-3/debian10/meta.json b/release/7-3/debian10/meta.json
index 49c40a0db..5918160b0 100644
--- a/release/7-3/debian10/meta.json
+++ b/release/7-3/debian10/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-debian-#shorttag#"
-    ],
+    "ShortDistroName": "debian",
     "shortTags": [
         {"Tag": "buster-slim"},
         {"Tag": "10"}
diff --git a/release/7-3/debian10/test-deps/meta.json b/release/7-3/debian10/test-deps/meta.json
index 9324ddfb2..36de679e8 100644
--- a/release/7-3/debian10/test-deps/meta.json
+++ b/release/7-3/debian10/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Debian 10",
     "tagTemplates": [
-        "preview-debian-#shorttag#"
+        "debian-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/debian11/meta.json b/release/7-3/debian11/meta.json
index cfc93d5f6..4325fbacc 100644
--- a/release/7-3/debian11/meta.json
+++ b/release/7-3/debian11/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "osVersion": "Debian 11",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-debian-#shorttag#"
-    ],
+    "ShortDistroName": "debian",
     "shortTags": [
         {"Tag": "bullseye-slim"},
         {"Tag": "11"}
diff --git a/release/7-3/debian11/test-deps/meta.json b/release/7-3/debian11/test-deps/meta.json
index 6ea7f586b..424e8a54f 100644
--- a/release/7-3/debian11/test-deps/meta.json
+++ b/release/7-3/debian11/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Debian 11 (Testing)",
     "tagTemplates": [
-        "preview-debian-#shorttag#"
+        "debian-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/debian9/meta.json b/release/7-3/debian9/meta.json
index 9ea5daac9..ec6267623 100644
--- a/release/7-3/debian9/meta.json
+++ b/release/7-3/debian9/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell-preview_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 9",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-debian-#shorttag#"
-    ],
+    "ShortDistroName": "debian",
     "shortTags": [
         {"Tag": "stretch-slim"},
         {"Tag": "9"}
diff --git a/release/7-3/debian9/test-deps/meta.json b/release/7-3/debian9/test-deps/meta.json
index ee83bc103..79d8a0610 100644
--- a/release/7-3/debian9/test-deps/meta.json
+++ b/release/7-3/debian9/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Debian 9",
     "tagTemplates": [
-        "preview-debian-#shorttag#"
+        "debian-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/fedora34/meta.json b/release/7-3/fedora34/meta.json
index 9250220a5..d56d9fa2d 100644
--- a/release/7-3/fedora34/meta.json
+++ b/release/7-3/fedora34/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "osVersion": "Fedora 34",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-fedora-#shorttag#"
-    ],
+    "ShortDistroName": "fedora",
     "shortTags": [
         {"Tag": "34"}
     ],
diff --git a/release/7-3/fedora34/test-deps/meta.json b/release/7-3/fedora34/test-deps/meta.json
index b21dea9f3..86fed226d 100644
--- a/release/7-3/fedora34/test-deps/meta.json
+++ b/release/7-3/fedora34/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Fedora 34",
     "tagTemplates": [
-        "preview-fedora-#shorttag#"
+        "fedora-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/mariner1/meta.json b/release/7-3/mariner1/meta.json
index c333c721a..cc44c165b 100644
--- a/release/7-3/mariner1/meta.json
+++ b/release/7-3/mariner1/meta.json
@@ -6,9 +6,7 @@
     "shortTags": [
         {"Tag": "1.0"}
     ],
-    "tagTemplates": [
-        "preview-mariner-#shorttag#"
-    ],
+    "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 387
diff --git a/release/7-3/mariner1/test-deps/meta.json b/release/7-3/mariner1/test-deps/meta.json
index 4ad96384f..a1a2a5369 100644
--- a/release/7-3/mariner1/test-deps/meta.json
+++ b/release/7-3/mariner1/test-deps/meta.json
@@ -4,7 +4,7 @@
     "SkipGssNtlmSspTests": true,
     "osVersion": "Mariner 1.0",
     "tagTemplates": [
-        "preview-mariner-#shorttag#"
+        "mariner-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
new file mode 100644
index 000000000..528ebc28f
--- /dev/null
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -0,0 +1,87 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM cblmariner2preview.azurecr.io/base/core:2.0 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+# Install dependencies and clean up
+RUN tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    # required for localization
+    icu \
+    # required for help in PowerShell
+    less \
+    # required for SSH
+    openssh-clients \
+    ca-certificates \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all \
+    # remove cache folders and files
+    && rm -rf /var/cache/yum
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
new file mode 100644
index 000000000..40f2958f8
--- /dev/null
+++ b/release/7-3/mariner2/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0",
+    "shortTags": [
+        {"Tag": "2.0"}
+    ],
+    "ShortDistroName": "mariner",
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 387
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..86fc72dc7
--- /dev/null
+++ b/release/7-3/mariner2/test-deps/docker/Dockerfile
@@ -0,0 +1,33 @@
+# Docker image file that describes an Mariner image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:mariner
+FROM ${BaseImage}
+
+# To find which package provides a particular command, run:
+# tdnf install dnf-utils
+# dnf provides <command>
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    # install dependencies
+    && tdnf install -y \
+    dnf-utils \
+    sudo \
+    curl \
+    wget \
+    # provides ping and trace path
+    iputils \
+    # provides ps
+    procps-ng \
+    unzip \
+    git \
+    # upgrade packages
+    && tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/mariner2/test-deps/meta.json b/release/7-3/mariner2/test-deps/meta.json
new file mode 100644
index 000000000..898d87f8a
--- /dev/null
+++ b/release/7-3/mariner2/test-deps/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0",
+    "tagTemplates": [
+        "mariner-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-redhat"
+    ],
+    "TestProperties": {
+        "size": 544
+    }
+}
diff --git a/release/7-3/nanoserver1809/meta.json b/release/7-3/nanoserver1809/meta.json
index 1eb5a6687..c50095fd5 100644
--- a/release/7-3/nanoserver1809/meta.json
+++ b/release/7-3/nanoserver1809/meta.json
@@ -7,9 +7,7 @@
             "Tag": "1809"
         }
     ],
-    "tagTemplates": [
-        "preview-nanoserver-#shorttag#"
-    ],
+    "ShortDistroName": "nanoserver",
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/7-3/nanoserver2022/meta.json b/release/7-3/nanoserver2022/meta.json
index 9de0db71a..91b80f257 100644
--- a/release/7-3/nanoserver2022/meta.json
+++ b/release/7-3/nanoserver2022/meta.json
@@ -7,11 +7,9 @@
             "Tag": "ltsc2022"
         }
     ],
-    "tagTemplates": [
-        "preview-nanoserver-#shorttag#"
-    ],
+    "ShortDistroName": "nanoserver",
     "manifestLists": [
-        "preview-nanoserver"
+        "nanoserver"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/7-3/nanoserver20H2/meta.json b/release/7-3/nanoserver20H2/meta.json
index 8745acfdb..7e55c181b 100644
--- a/release/7-3/nanoserver20H2/meta.json
+++ b/release/7-3/nanoserver20H2/meta.json
@@ -7,9 +7,7 @@
             "Tag": "20H2"
         }
     ],
-    "tagTemplates": [
-        "preview-nanoserver-#shorttag#"
-    ],
+    "ShortDistroName": "nanoserver",
     "Base64EncodePackageUrl": true,
     "TestProperties": {
         "size": 1
diff --git a/release/7-3/ubi84/meta.json b/release/7-3/ubi84/meta.json
index 559a74e53..85a66b0fa 100644
--- a/release/7-3/ubi84/meta.json
+++ b/release/7-3/ubi84/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Universal Base Image 8.4",
-    "tagTemplates": [
-        "preview-ubi-#shorttag#"
-    ],
+    "ShortDistroName": "ubi",
     "shortTags": [
         {"Tag": "8.4"}
     ],
diff --git a/release/7-3/ubi84/test-deps/meta.json b/release/7-3/ubi84/test-deps/meta.json
index 7996a5edc..e6da04678 100644
--- a/release/7-3/ubi84/test-deps/meta.json
+++ b/release/7-3/ubi84/test-deps/meta.json
@@ -7,7 +7,7 @@
         {"Tag": "8.4"}
     ],
     "tagTemplates": [
-        "preview-ubi-#shorttag#"
+        "ubi-#shorttag#"
     ],
     "OptionalTests": [
         "test-deps"
diff --git a/release/7-3/ubuntu16.04/meta.json b/release/7-3/ubuntu16.04/meta.json
index d6c694009..a750b9c07 100644
--- a/release/7-3/ubuntu16.04/meta.json
+++ b/release/7-3/ubuntu16.04/meta.json
@@ -3,9 +3,7 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
-    ],
+    "ShortDistroName": "ubuntu",
     "shortTags": [
         {"Tag": "xenial"},
         {"Tag": "16.04"}
diff --git a/release/7-3/ubuntu16.04/test-deps/meta.json b/release/7-3/ubuntu16.04/test-deps/meta.json
index 52857c13b..8152d828e 100644
--- a/release/7-3/ubuntu16.04/test-deps/meta.json
+++ b/release/7-3/ubuntu16.04/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Ubuntu 16.04",
     "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
+        "ubuntu-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/ubuntu18.04/meta.json b/release/7-3/ubuntu18.04/meta.json
index cb5598d5a..2105de12a 100644
--- a/release/7-3/ubuntu18.04/meta.json
+++ b/release/7-3/ubuntu18.04/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 18.04",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
-    ],
+    "ShortDistroName": "ubuntu",
     "shortTags": [
         {"Tag": "bionic"},
         {"Tag": "18.04"}
diff --git a/release/7-3/ubuntu18.04/test-deps/meta.json b/release/7-3/ubuntu18.04/test-deps/meta.json
index 77e767295..83453bb64 100644
--- a/release/7-3/ubuntu18.04/test-deps/meta.json
+++ b/release/7-3/ubuntu18.04/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Ubuntu 18.04",
     "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
+        "ubuntu-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
index 44866a878..a6d24ffa9 100644
--- a/release/7-3/ubuntu20.04/meta.json
+++ b/release/7-3/ubuntu20.04/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "osVersion": "Ubuntu 20.04",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
-    ],
+    "ShortDistroName": "ubuntu",
     "shortTags": [
         {"Tag": "focal"},
         {"Tag": "20.04"}
diff --git a/release/7-3/ubuntu20.04/test-deps/meta.json b/release/7-3/ubuntu20.04/test-deps/meta.json
index daa8a5151..b01cc7075 100644
--- a/release/7-3/ubuntu20.04/test-deps/meta.json
+++ b/release/7-3/ubuntu20.04/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Ubuntu 20.04",
     "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
+        "ubuntu-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
index cb75153bd..3dba66205 100644
--- a/release/7-3/ubuntu22.04/meta.json
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -4,9 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "osVersion": "Ubuntu 22.04",
     "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
-    ],
+    "ShortDistroName": "ubuntu",
     "shortTags": [
         {"Tag": "jammy"},
         {"Tag": "22.04"}
diff --git a/release/7-3/ubuntu22.04/test-deps/meta.json b/release/7-3/ubuntu22.04/test-deps/meta.json
index 735f5e9d0..c488d53c1 100644
--- a/release/7-3/ubuntu22.04/test-deps/meta.json
+++ b/release/7-3/ubuntu22.04/test-deps/meta.json
@@ -3,7 +3,7 @@
     "UseLinuxVersion": false,
     "osVersion": "Ubuntu 22.04",
     "tagTemplates": [
-        "preview-ubuntu-#shorttag#"
+        "ubuntu-#shorttag#"
     ],
     "SubRepository": "test-deps",
     "OptionalTests": [
diff --git a/release/7-3/windowsserver2022/meta.json b/release/7-3/windowsserver2022/meta.json
index 08215f237..1be0aa667 100644
--- a/release/7-3/windowsserver2022/meta.json
+++ b/release/7-3/windowsserver2022/meta.json
@@ -8,11 +8,9 @@
         }
     ],
     "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "preview-windowsserver-#shorttag#"
-    ],
+    "ShortDistroName": "windowsserver",
     "manifestLists": [
-        "preview-windowsserver"
+        "windowsserver"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/7-3/windowsservercore2022/meta.json b/release/7-3/windowsservercore2022/meta.json
index a587382c6..849bbfb0d 100644
--- a/release/7-3/windowsservercore2022/meta.json
+++ b/release/7-3/windowsservercore2022/meta.json
@@ -11,9 +11,7 @@
         "preview"
     ],
     "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "preview-windowsservercore-#shorttag#"
-    ],
+    "ShortDistroName": "windowsservercore",
     "TestProperties": {
         "size": 1
     },
diff --git a/release/7-3/windowsservercore20H2/meta.json b/release/7-3/windowsservercore20H2/meta.json
index f6a09af61..4a6a0bc2e 100644
--- a/release/7-3/windowsservercore20H2/meta.json
+++ b/release/7-3/windowsservercore20H2/meta.json
@@ -8,9 +8,7 @@
         }
     ],
     "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "preview-windowsservercore-#shorttag#"
-    ],
+    "ShortDistroName": "windowsservercore",
     "TestProperties": {
         "size": 1
     },
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index ecbd74b5a..fcec42632 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -162,6 +162,24 @@ enum DistributionState {
 }
 
 class DockerImageMetaData {
+    [void] Init() {
+        if (!$this.tagTemplates -and $this.ShortDistroName) {
+            $this.tagTemplates = @(
+                '#psversion#-' + $this.ShortDistroName + '-#shorttag#'
+                $this.ShortDistroName + '-#shorttag#'
+            )
+        }
+
+        switch -RegEx ($this.GetDistributionState()) {
+            'Unknown|Validating' {
+                $this.OsVersion = $this.OsVersion + ' (In Validation)'
+            }
+            'EndOfLife' {
+                $this.OsVersion = $this.OsVersion + ' (End of Life)'
+            }
+        }
+    }
+
     [Bool]
     $IsLinux = $false
 
@@ -199,7 +217,7 @@ class DockerImageMetaData {
     $ShortTags
 
     [string[]]
-    $tagTemplates
+    $TagTemplates
 
     [string]
     $SubImage
@@ -247,6 +265,9 @@ class DockerImageMetaData {
 
         return $this.DistributionState
     }
+
+
+    [string] $ShortDistroName
 }
 
 class ShortTagMetaData {
@@ -265,7 +286,9 @@ Function Get-DockerImageMetaData
     {
         try {
             $meta = Get-Content -Path $Path | ConvertFrom-Json
-            return [DockerImageMetaData] $meta
+            $dockerImageMeta = [DockerImageMetaData] $meta
+            $dockerImageMeta.Init()
+            return $dockerImageMeta
         }
         catch {
             throw "$_ converting $Path"
@@ -928,6 +951,9 @@ function Invoke-PesterWrapper {
         Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
     }
 
+    Remove-Module Pester -Force -ErrorAction SilentlyContinue
+    Import-Module pester -MaximumVersion 4.99 -Scope Global
+
     Write-Verbose -Message "logging to $OutputFile" -Verbose
     $results = $null
     $results = Invoke-Pester -Script $Script -OutputFile $OutputFile -PassThru -OutputFormat NUnitXml @extraParams
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index 570efd13a..e07c64043 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -8,6 +8,7 @@
     {
         "name": "preview",
         "path": "release/7-3",
+        "tagPrefix": "preview",
         "pwshInstallVersion": "7-preview",
         "packageTag": "-preview"
     },

From 15372f141a8d57ee0b4b978833b44c1afcd81b25 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 11 May 2022 11:13:26 -0700
Subject: [PATCH 193/354] Add metadata to JSON to control images that will run
 in CI (#643)

* Add metadata to JSON to control images that will run in CI

* fix mariner for changes in the image

* Update tests/container.tests.ps1
---
 build.ps1                              | 24 ++++++++++++++----------
 release/7-2/mariner2/docker/Dockerfile |  7 +++++++
 release/7-3/alpine313/meta.json        |  3 ++-
 release/7-3/alpine314/meta.json        |  3 ++-
 release/7-3/arm32v7/meta.json          |  3 ++-
 release/7-3/mariner2/docker/Dockerfile | 14 ++++++++++----
 release/7-3/ubuntu20.04/meta.json      |  3 ++-
 tests/container.tests.ps1              |  1 +
 tools/buildHelper/buildHelper.psm1     |  2 ++
 9 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/build.ps1 b/build.ps1
index e225c1e16..3e7aad9e7 100755
--- a/build.ps1
+++ b/build.ps1
@@ -456,18 +456,20 @@ End {
                         }
 
                         $tag = [PSCustomObject]@{
-                            Architecture    = $architecture
-                            OsVersion       = $osVersion
-                            Os              = $os
-                            Tags            = $actualTagData.TagList
-                            Dockerfile      = $dockerfile
-                            Channel         = $actualChannel
-                            Name            = $dockerFileName
-                            UseAcr          = $UseAcr
-                            ContinueOnError = $continueOnError
-                            ManifestLists   = $manifestLists
+                            Architecture      = $architecture
+                            OsVersion         = $osVersion
+                            Os                = $os
+                            Tags              = $actualTagData.TagList
+                            Dockerfile        = $dockerfile
+                            Channel           = $actualChannel
+                            Name              = $dockerFileName
+                            UseAcr            = $UseAcr
+                            ContinueOnError   = $continueOnError
+                            ManifestLists     = $manifestLists
                             EndOfLife         = $allMeta.meta.EndOfLife
                             DistributionState = $allMeta.meta.GetDistributionState().ToString()
+                            IsLinux           = $allMeta.meta.IsLinux
+                            UseInCI           = $allMeta.meta.UseInCI
                         }
 
                         $tagGroups[$tagGroup] += $tag
@@ -605,6 +607,8 @@ End {
                                     OsVersion         = $tag.OsVersion
                                     # azDevOps doesn't support arrays
                                     TagList           = $tag.Tags -join ';'
+                                    IsLinux           = $tag.IsLinux
+                                    UseInCI           = $tag.UseInCI
                                 })
                         }
                     }
diff --git a/release/7-2/mariner2/docker/Dockerfile b/release/7-2/mariner2/docker/Dockerfile
index bcba6ea4e..23737c242 100644
--- a/release/7-2/mariner2/docker/Dockerfile
+++ b/release/7-2/mariner2/docker/Dockerfile
@@ -20,6 +20,13 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
 
+# Install tar a gzip so we can unzip the tar.gz
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y \
+    tar \
+    gzip \
+    && tdnf clean all
+
 # Unzip the Linux tar.gz
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
diff --git a/release/7-3/alpine313/meta.json b/release/7-3/alpine313/meta.json
index 4b386a3aa..9858e00c9 100644
--- a/release/7-3/alpine313/meta.json
+++ b/release/7-3/alpine313/meta.json
@@ -13,5 +13,6 @@
         "size": 221
     },
     "EndOfLife": "2022-11-01",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-3/alpine314/meta.json b/release/7-3/alpine314/meta.json
index 99aab3d1f..9d258f41f 100644
--- a/release/7-3/alpine314/meta.json
+++ b/release/7-3/alpine314/meta.json
@@ -13,5 +13,6 @@
         "size": 221
     },
     "EndOfLife": "2023-05-01",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-3/arm32v7/meta.json b/release/7-3/arm32v7/meta.json
index f9330dce3..797bb2c38 100644
--- a/release/7-3/arm32v7/meta.json
+++ b/release/7-3/arm32v7/meta.json
@@ -16,5 +16,6 @@
         "Arm32": true
     },
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index 528ebc28f..f25c9c2e8 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -20,6 +20,13 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
 
+# Install tar a gzip so we can unzip the tar.gz
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y \
+    tar \
+    gzip \
+    && tdnf clean all
+
 # Unzip the Linux tar.gz
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
@@ -45,7 +52,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
 
 # Install dependencies and clean up
-RUN tdnf update -y \
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
     # install dependencies
     && tdnf install -y \
     # required for localization
@@ -58,9 +66,7 @@ RUN tdnf update -y \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
-    && tdnf clean all \
-    # remove cache folders and files
-    && rm -rf /var/cache/yum
+    && tdnf clean all
 
 # Give all user execute permissions and remove write permissions for others
 RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
index a6d24ffa9..30aed21c4 100644
--- a/release/7-3/ubuntu20.04/meta.json
+++ b/release/7-3/ubuntu20.04/meta.json
@@ -17,5 +17,6 @@
     },
     "SubImage": "test-deps",
     "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index f1ad8bbce..1427f27c5 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -487,6 +487,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
                 @{command = 'su'}
                 @{command = 'sudo'}
                 @{command = 'tar'}
+                @{command = 'gzip'}
                 @{command = 'unzip'}
                 @{command = 'wget'}
             )
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index fcec42632..38acde310 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -268,6 +268,8 @@ class DockerImageMetaData {
 
 
     [string] $ShortDistroName
+
+    [bool]$UseInCI = $true
 }
 
 class ShortTagMetaData {

From 6906b5c9a3d3fb078f6b151af3e4aee1745eb50e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 11 May 2022 15:36:07 -0700
Subject: [PATCH 194/354] Add Component Governance (#641)

* Add component governance to build

write command

remove space

capture variable

add cg display name

oops

* fix engineering system

* log only for pull requests

* fix condition
---
 .../build-ps1-unittests/buildUnitTests.yml    |  2 +-
 .vsts-ci/phase.yml                            | 20 ++++++++++++
 build.ps1                                     | 29 +++++++++++------
 tools/buildHelper/buildHelper.psm1            | 32 +++++++++++++++++++
 unittests/build.tests.ps1                     |  9 ++++--
 unittests/generateMatrixJson.tests.ps1        | 24 ++++++++------
 6 files changed, 94 insertions(+), 22 deletions(-)

diff --git a/.vsts-ci/build-ps1-unittests/buildUnitTests.yml b/.vsts-ci/build-ps1-unittests/buildUnitTests.yml
index d4fffef9d..3d85cb958 100644
--- a/.vsts-ci/build-ps1-unittests/buildUnitTests.yml
+++ b/.vsts-ci/build-ps1-unittests/buildUnitTests.yml
@@ -37,7 +37,7 @@ stages:
       - pwsh: |
           $OutputFile = "$PWD/build-unit-tests.xml"
           $results = $null
-          $results = Invoke-Pester -Script ./unittests/ -OutputFile $OutputFile -PassThru -OutputFormat NUnitXml
+          $results = Invoke-Pester -Script ./unittests/ -OutputFile $OutputFile -PassThru -OutputFormat NUnitXml -Show Failed, Context, Describe, Fails
           Write-Host "##vso[artifact.upload containerfolder=testResults;artifactname=testResults]$OutputFile"
           if(!$results -or $results.FailedCount -gt 0 -or !$results.TotalCount)
           {
diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 2dd9c8cca..001bda6b6 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -17,6 +17,7 @@ jobs:
       maxParallel: ${{ parameters.maxParallel }}
   variables:
     ContinueOnError: ${{ parameters.continueonerror }}
+    scanType: Register
 
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -27,6 +28,11 @@ jobs:
       displayName: 'Enable ACR'
       condition: ne(variables['ACR'], 'no')
 
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=scanType;]LogOnly"
+    displayName: Set scanType to LogOnly For PRs
+    condition: eq(variables['Build.Reason'], 'PullRequest')
+
   - pwsh: 'Get-ChildItem env:'
     displayName: 'Capture Environment'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
@@ -55,6 +61,20 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
     continueOnError: ${{ variables.continueonerror }}
 
+  - pwsh: |
+      Get-ChildItem env:\docker*
+    displayName: 'Capture Docker* Environment Variables'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - task: ComponentGovernanceComponentDetection@0
+    inputs:
+      dockerImagesToScan: $(dockerImagesToScan)
+      scanType: $(scanType)
+      verbosity: 'Verbose'
+      alertWarningLevel: 'High'
+      failOnAlert: true
+    displayName: Component Governance - $(ImageName) $(Channel)
+
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }
       $files = @(Get-ChildItem -Recurse test*.xml)
diff --git a/build.ps1 b/build.ps1
index 3e7aad9e7..f61242251 100755
--- a/build.ps1
+++ b/build.ps1
@@ -527,11 +527,25 @@ End {
         Invoke-PesterWrapper -Script $testsPath -OutputFile $logPath -ExtraParams $extraParams
     }
 
-    # print local image names
-    # used only with the -Build
-    foreach($fullName in $localImageNames)
-    {
-        Write-Verbose "image name: $fullName" -Verbose
+    Write-Verbose "!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$GenerateManifestLists -and '$($PSCmdlet.ParameterSetName)' -notlike '*All'" -Verbose
+    if (!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$GenerateManifestLists -and $PSCmdlet.ParameterSetName -notlike '*All') {
+        $dockerImagesToScan = ''
+        # print local image names
+        # used only with the -Build
+        foreach ($fullName in $localImageNames) {
+            Write-Verbose "image name: $fullName" -Verbose
+
+            if ($dockerImagesToScan -ne '') {
+                $dockerImagesToScan += ',' + $dockerImagesToScan
+            }
+            else {
+                $dockerImagesToScan += $fullName
+            }
+        }
+
+        if ($dockerImagesToScan) {
+            Set-BuildVariable -Name 'dockerImagesToScan' -Value $dockerImagesToScan
+        }
     }
 
     if($GenerateTagsYaml.IsPresent)
@@ -623,11 +637,8 @@ End {
                 $fullMatrix[$channelName] += $osMatrix.Values
                 $matrixJson = $osMatrix | ConvertTo-Json -Compress
                 $variableName = "matrix_${channelName}_${osName}"
-                $command = "vso[task.setvariable variable=$variableName;isoutput=true]$($matrixJson)"
                 if (!$FullJson) {
-                    Set-Item -Path ENV:$VariableName -Value $matrixJson
-                    Write-Verbose "sending command: '$command'"
-                    Write-Host "##$command"
+                    Set-BuildVariable -Name $variableName -Value $matrixJson -IsOutput
                 }
             }
         }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 38acde310..e8c6b91bb 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -964,3 +964,35 @@ function Invoke-PesterWrapper {
         throw "Build or tests failed.  Passed: $($results.PassedCount) Failed: $($results.FailedCount) Total: $($results.TotalCount)"
     }
 }
+
+# Sets a build variable
+Function Set-BuildVariable
+{
+    param(
+        [Parameter(Mandatory=$true)]
+        [string]
+        $Name,
+
+        [Parameter(Mandatory=$true)]
+        [string]
+        $Value,
+
+        [switch]
+        $IsOutput
+    )
+
+    $IsOutputString = if ($IsOutput) { 'true' } else { 'false' }
+    $command = "vso[task.setvariable variable=$Name;isOutput=$IsOutputString]$Value"
+
+    # always log command to make local debugging easier
+    Write-Verbose -Message "sending command: $command" -Verbose
+
+    if ($env:TF_BUILD) {
+        # In VSTS
+        Write-Host "##$command"
+        # The variable will not show up until the next task.
+    }
+
+    # Setting in the current session for the same behavior as the CI and to make it show up in the same task
+    Set-Item env:/$name -Value $Value
+}
diff --git a/unittests/build.tests.ps1 b/unittests/build.tests.ps1
index 73d3600cb..e220210fa 100644
--- a/unittests/build.tests.ps1
+++ b/unittests/build.tests.ps1
@@ -9,12 +9,17 @@ Describe "buildps1-Build" {
         Mock -CommandName "Invoke-PesterWrapper" -MockWith {
             Write-Verbose "Mocking Invoke-PesterWrapper" -Verbose
         } -ParameterFilter { $ExtraParams -ne $null}
+        Mock -CommandName "Set-BuildVariable" -MockWith {
+            Write-Verbose "Mocking Set-BuildVariable" -Verbose
+        } -ParameterFilter { $ExtraParams -ne $null}
     }
     Context "-Channel -Name" {
         It "Should invoke pester" {
             & $buildScript -Build -Name "mariner1" -Channel preview 4>&1 | out-null
-            Assert-VerifiableMock
+            Assert-MockCalled -CommandName "Invoke-PesterWrapper" -Times 1
+            Assert-MockCalled -CommandName "Set-BuildVariable" -Times 1
         }
+
         It "throw if name doesn't exist" {
             [Type] $exceptionType = [System.Management.Automation.ParameterBindingException]
             {& $buildScript -Build -Name "doesntexist" -Channel preview 4>&1 } | Should -Throw -ExceptionType $exceptionType
@@ -23,7 +28,7 @@ Describe "buildps1-Build" {
     Context "-channel -all" {
         It "Should invoke pester" {
             & $buildScript -Build -channel stable -all 4>&1 | out-null
-            Assert-VerifiableMock
+            Assert-MockCalled -CommandName "Invoke-PesterWrapper" -Times 1
         }
     }
 }
diff --git a/unittests/generateMatrixJson.tests.ps1 b/unittests/generateMatrixJson.tests.ps1
index a0e34c221..eeb61a9e0 100644
--- a/unittests/generateMatrixJson.tests.ps1
+++ b/unittests/generateMatrixJson.tests.ps1
@@ -6,6 +6,7 @@ Describe "build.ps1 -GenerateMatrixJson" {
         Write-Verbose "repoRoot: $repoRoot"
         $buildScript = Join-Path $repoRoot "build.ps1"
         Write-Verbose "buildScript: $buildScript"
+        Import-Module -Name "$repoRoot/tools/buildHelper" -Scope Global
     }
     Context "By channel" {
         BeforeAll {
@@ -18,25 +19,28 @@ Describe "build.ps1 -GenerateMatrixJson" {
                 Write-Verbose "got write-Host" -Verbose
                 $global:writeHostBuffer += $Object.ToString()
             }
+            $global:matrixValue = @()
+            Mock -CommandName "Set-BuildVariable" -MockWith {
+                $global:matrixValue += [pscustomobject]@{
+                    Value=$Value
+                    Name=$Name
+                }
+                Write-Verbose "Mocking Set-BuildVariable" -Verbose
+            }
+
         }
         BeforeEach {
             $Channel = 'stable'
             $pattern = '##vso\[task\.setvariable variable=matrix_'+$Channel+'_(windows|linux);isoutput=true]'
         }
-        It "Should Write to host" {
+        It "Should Set matrix" {
             $vstsCmd = & $buildScript -GenerateMatrixJson -Channel $Channel 4>$null
-            $Global:writeHostBuffer.count | should -BeGreaterThan 1
-        }
-        It "Commands sholud be vso commands" {
-            foreach($vstsCmd in $Global:writeHostBuffer) {
-                $vstsCmd | Should -Match $pattern
-            }
+            Assert-MockCalled -CommandName "Set-BuildVariable" -Times 1
         }
         It "Should have generated valid json" {
             $script:matrix = @()
-            foreach($vstsCmd in $Global:writeHostBuffer) {
-                Write-Verbose "vstsCmd: $vstsCmd"
-                $json = $vstsCmd -replace $pattern
+            foreach($vstsVariable in $global:matrixValue) {
+                $json = $vstsVariable.Value
                 { $script:matrix += $json | ConvertFrom-Json -AsHashtable } | should -not -Throw
             }
             $script:matrix.count | Should -Be 2

From d32654da0d2a1fb584e09f66c05f2565a75b8f6e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 13 May 2022 15:21:51 -0700
Subject: [PATCH 195/354] Run Component Governance during release (#644)

* Run CG during release

* Disable Docker secure supply chain warnings
---
 .vsts-ci/phase.yml           |  1 +
 .vsts-ci/releasePhase.yml    | 16 ++++++++++++++--
 .vsts-ci/releasePipeline.yml |  1 +
 .vsts-ci/releasebuild.yml    |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 001bda6b6..e79bf4752 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -15,6 +15,7 @@ jobs:
   strategy:
       matrix: $[ ${{ parameters.matrix }} ]
       maxParallel: ${{ parameters.maxParallel }}
+
   variables:
     ContinueOnError: ${{ parameters.continueonerror }}
     scanType: Register
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index a8c149a0a..729efe018 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -25,6 +25,7 @@ jobs:
     dockerImage: 'powershell'
     ACR: ${{ parameters.ACR }}
     releaseTag: ${{ parameters.releaseTag }}
+    scanType: Register
 
   pool:
     name: PowerShell1ES
@@ -67,8 +68,9 @@ jobs:
     displayName: 'Capture Environment'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
-    displayName: 'docker login'
+  - pwsh: |
+      docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)
+    displayName: 'docker login $(dockerHost)'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
@@ -111,6 +113,16 @@ jobs:
     displayName: 'Build All $(Channel)'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
+  - task: ComponentGovernanceComponentDetection@0
+    inputs:
+      dockerImagesToScan: $(dockerImagesToScan)
+      scanType: $(scanType)
+      verbosity: 'Verbose'
+      alertWarningLevel: 'High'
+      failOnAlert: true
+    displayName: Component Governance - $(ImageName) $(Channel)
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''), ne(variables['ACR'],'No'))
+
   - pwsh: 'docker logout $(dockerHost)'
     displayName: 'docker logout'
     condition: and( always(), ne(variables['Channel'],''))
diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
index dab8cb66b..749e43a4e 100644
--- a/.vsts-ci/releasePipeline.yml
+++ b/.vsts-ci/releasePipeline.yml
@@ -19,6 +19,7 @@ resources:
 
 variables:
   runCodesignValidationInjection: false
+  DisableDockerDetector: true
 
 stages:
 - template: ./templatesReleasePipeline/testAndRelease.yml
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index d04efa1cf..3006c2f14 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -19,6 +19,7 @@ variables:
   ltsReleaseTag: ${{ parameters.ltsReleaseTag }}
   stableReleaseTag: ${{ parameters.stableReleaseTag }}
   runCodesignValidationInjection: false
+  DisableDockerDetector: true
 
 stages:
   - stage: GenerateFullTag

From 996acaa91edc00d5b6b8888010fcc87c40305bad Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 16 May 2022 11:24:16 -0700
Subject: [PATCH 196/354] Remove distribution that .NET 7 doesn't support
 (#646)

* .NET 7 doesn't support Debian 0

* Delete release/7-3/ubuntu18.04 directory

* Delete release/7-3/ubuntu16.04 directory

* Delete release/7-3/arm32v7 directory
---
 release/7-3/arm32v7/docker/Dockerfile         | 72 -------------------
 release/7-3/arm32v7/meta.json                 | 21 ------
 release/7-3/debian9/docker/Dockerfile         | 65 -----------------
 release/7-3/debian9/meta.json                 | 18 -----
 .../7-3/debian9/test-deps/docker/Dockerfile   | 24 -------
 release/7-3/debian9/test-deps/meta.json       | 16 -----
 release/7-3/ubuntu16.04/docker/Dockerfile     | 61 ----------------
 release/7-3/ubuntu16.04/meta.json             | 18 -----
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 23 ------
 release/7-3/ubuntu16.04/test-deps/meta.json   | 16 -----
 release/7-3/ubuntu18.04/docker/Dockerfile     | 61 ----------------
 release/7-3/ubuntu18.04/meta.json             | 18 -----
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 23 ------
 release/7-3/ubuntu18.04/test-deps/meta.json   | 16 -----
 14 files changed, 452 deletions(-)
 delete mode 100644 release/7-3/arm32v7/docker/Dockerfile
 delete mode 100644 release/7-3/arm32v7/meta.json
 delete mode 100644 release/7-3/debian9/docker/Dockerfile
 delete mode 100644 release/7-3/debian9/meta.json
 delete mode 100644 release/7-3/debian9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/debian9/test-deps/meta.json
 delete mode 100644 release/7-3/ubuntu16.04/docker/Dockerfile
 delete mode 100644 release/7-3/ubuntu16.04/meta.json
 delete mode 100644 release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/ubuntu16.04/test-deps/meta.json
 delete mode 100644 release/7-3/ubuntu18.04/docker/Dockerfile
 delete mode 100644 release/7-3/ubuntu18.04/meta.json
 delete mode 100644 release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/ubuntu18.04/test-deps/meta.json

diff --git a/release/7-3/arm32v7/docker/Dockerfile b/release/7-3/arm32v7/docker/Dockerfile
deleted file mode 100644
index 9a73e2ff1..000000000
--- a/release/7-3/arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM arm32v7/ubuntu:bionic AS installer-env
-
-ARG PS_VERSION=6.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM arm32v7/ubuntu:bionic AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ARG PS_VERSION=6.2.3
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libssl1.0 libicu60 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/arm32v7/meta.json b/release/7-3/arm32v7/meta.json
deleted file mode 100644
index 797bb2c38..000000000
--- a/release/7-3/arm32v7/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
-    "osVersion": "Ubuntu 18.04 ARM 32v7",
-    "SkipGssNtlmSspTests": true,
-    "Base64EncodePackageUrl": true,
-    "UseAcr": true,
-    "ShortDistroName": "arm32v7-ubuntu",
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 550,
-        "Arm32": true
-    },
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-3/debian9/docker/Dockerfile b/release/7-3/debian9/docker/Dockerfile
deleted file mode 100644
index 5c6c9d7e5..000000000
--- a/release/7-3/debian9/docker/Dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:stretch-slim AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian9/meta.json b/release/7-3/debian9/meta.json
deleted file mode 100644
index ec6267623..000000000
--- a/release/7-3/debian9/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-preview_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Debian 9",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "stretch-slim"},
-        {"Tag": "9"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    },
-    "EndOfLife": "2022-06-30",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/debian9/test-deps/docker/Dockerfile b/release/7-3/debian9/test-deps/docker/Dockerfile
deleted file mode 100644
index af307292e..000000000
--- a/release/7-3/debian9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian9/test-deps/meta.json b/release/7-3/debian9/test-deps/meta.json
deleted file mode 100644
index 79d8a0610..000000000
--- a/release/7-3/debian9/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 9",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 316
-    }
-}
diff --git a/release/7-3/ubuntu16.04/docker/Dockerfile b/release/7-3/ubuntu16.04/docker/Dockerfile
deleted file mode 100644
index ef0c694a8..000000000
--- a/release/7-3/ubuntu16.04/docker/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM ubuntu:16.04 AS installer-env
-
-ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/7-3/ubuntu16.04/meta.json b/release/7-3/ubuntu16.04/meta.json
deleted file mode 100644
index a750b9c07..000000000
--- a/release/7-3/ubuntu16.04/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 16.04",
-    "ShortDistroName": "ubuntu",
-    "shortTags": [
-        {"Tag": "xenial"},
-        {"Tag": "16.04"}
-    ],
-    "SkipGssNtlmSspTests": false,
-    "TestProperties": {
-        "size": 395
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2021-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 4299f3a38..000000000
--- a/release/7-3/ubuntu16.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/ubuntu16.04/test-deps/meta.json b/release/7-3/ubuntu16.04/test-deps/meta.json
deleted file mode 100644
index 8152d828e..000000000
--- a/release/7-3/ubuntu16.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 399
-    }
-}
diff --git a/release/7-3/ubuntu18.04/docker/Dockerfile b/release/7-3/ubuntu18.04/docker/Dockerfile
deleted file mode 100644
index 589a4902a..000000000
--- a/release/7-3/ubuntu18.04/docker/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:18.04 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-rc.1
-ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/7-3/ubuntu18.04/meta.json b/release/7-3/ubuntu18.04/meta.json
deleted file mode 100644
index 2105de12a..000000000
--- a/release/7-3/ubuntu18.04/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 18.04",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "ubuntu",
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
deleted file mode 100644
index c8e9e805a..000000000
--- a/release/7-3/ubuntu18.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/ubuntu18.04/test-deps/meta.json b/release/7-3/ubuntu18.04/test-deps/meta.json
deleted file mode 100644
index 83453bb64..000000000
--- a/release/7-3/ubuntu18.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 18.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 358
-    }
-}

From 1fd0752a327f8dcc7443f882a243d1cfa62ab8c6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 13:38:06 -0700
Subject: [PATCH 197/354] Update the release build yaml with the latest
 versions (#647)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3006c2f14..7e10beca6 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.3.0-preview.3'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.3'
+    default: 'v7.2.4'
   - name: 'stableReleaseTag'
-    default: 'v7.2.3'
+    default: 'v7.2.4'
 
 resources:
 - repo: self

From b72add0fdf142efce26ae60583e1b06fc42381c0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 18 May 2022 16:03:42 -0700
Subject: [PATCH 198/354] Add support for alpine 3.15 (#649)

* Add support for alpine 3.15

* Update release/7-3/alpine315/meta.json

* Update test deps image expected size for ubuntu20
---
 release/7-2/ubuntu20.04/test-deps/meta.json   |  2 +-
 release/7-3/alpine315/docker/Dockerfile       | 89 +++++++++++++++++++
 release/7-3/alpine315/meta.json               | 18 ++++
 .../7-3/alpine315/test-deps/docker/Dockerfile | 40 +++++++++
 release/7-3/alpine315/test-deps/meta.json     | 16 ++++
 5 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 release/7-3/alpine315/docker/Dockerfile
 create mode 100644 release/7-3/alpine315/meta.json
 create mode 100644 release/7-3/alpine315/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/alpine315/test-deps/meta.json

diff --git a/release/7-2/ubuntu20.04/test-deps/meta.json b/release/7-2/ubuntu20.04/test-deps/meta.json
index f8b2b7f62..a5ff92464 100644
--- a/release/7-2/ubuntu20.04/test-deps/meta.json
+++ b/release/7-2/ubuntu20.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 406
+        "size": 430
     }
 }
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
new file mode 100644
index 000000000..923dd37e8
--- /dev/null
+++ b/release/7-3/alpine315/docker/Dockerfile
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
+
+FROM alpine:3.15 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.0.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM alpine:3.15
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.15
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine315/meta.json b/release/7-3/alpine315/meta.json
new file mode 100644
index 000000000..a88206977
--- /dev/null
+++ b/release/7-3/alpine315/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.15",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.15"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 221
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-3/alpine315/test-deps/docker/Dockerfile b/release/7-3/alpine315/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..e2acfa6af
--- /dev/null
+++ b/release/7-3/alpine315/test-deps/docker/Dockerfile
@@ -0,0 +1,40 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.15
+
+FROM node:14.17.6-alpine as node
+
+# Do nothing, just added to borrow the already built node files.
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.15
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+# Copy node and yarn into image
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+    bash \
+    sudo \
+    shadow \
+    openssl \
+    curl \
+    git \
+    unzip \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine315/test-deps/meta.json b/release/7-3/alpine315/test-deps/meta.json
new file mode 100644
index 000000000..f71e6eac6
--- /dev/null
+++ b/release/7-3/alpine315/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.14",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}

From 05e19241ae53f92e54418e1539a1e12b3164a3c3 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 18 May 2022 19:29:33 -0400
Subject: [PATCH 199/354] Add ubi9 image to preview (#648)

* add ubi9 image to preview, and fix distribution channel version for ubi8.4

* Apply suggestions from code review

* Update container.tests.ps1

* Update tests/container.tests.ps1

* Update tests/container.tests.ps1

* Update buildHelper.psm1

* Update release/7-3/ubi9/meta.json

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>

* Update release/7-3/ubi9/docker/Dockerfile

* Update release/7-3/ubi9/test-deps/meta.json

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/7-2/ubi84/docker/Dockerfile           |  2 +-
 release/7-2/ubi84/test-deps/docker/Dockerfile |  2 +-
 release/7-3/ubi84/docker/Dockerfile           |  2 +-
 release/7-3/ubi84/test-deps/docker/Dockerfile |  2 +-
 release/7-3/ubi9/docker/Dockerfile            | 61 +++++++++++++++++++
 release/7-3/ubi9/meta.json                    | 17 ++++++
 release/7-3/ubi9/test-deps/docker/Dockerfile  | 22 +++++++
 release/7-3/ubi9/test-deps/meta.json          | 20 ++++++
 tests/container.tests.ps1                     | 11 +++-
 tools/buildHelper/buildHelper.psm1            |  1 +
 10 files changed, 133 insertions(+), 7 deletions(-)
 create mode 100644 release/7-3/ubi9/docker/Dockerfile
 create mode 100644 release/7-3/ubi9/meta.json
 create mode 100644 release/7-3/ubi9/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/ubi9/test-deps/meta.json

diff --git a/release/7-2/ubi84/docker/Dockerfile b/release/7-2/ubi84/docker/Dockerfile
index 16d179d54..2c57b4a95 100644
--- a/release/7-2/ubi84/docker/Dockerfile
+++ b/release/7-2/ubi84/docker/Dockerfile
@@ -35,7 +35,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.3
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
 
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
diff --git a/release/7-2/ubi84/test-deps/docker/Dockerfile b/release/7-2/ubi84/test-deps/docker/Dockerfile
index c51396080..c4df646c2 100644
--- a/release/7-2/ubi84/test-deps/docker/Dockerfile
+++ b/release/7-2/ubi84/test-deps/docker/Dockerfile
@@ -16,7 +16,7 @@ RUN yum install -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.3
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/7-3/ubi84/docker/Dockerfile b/release/7-3/ubi84/docker/Dockerfile
index bcf97336e..38542412c 100644
--- a/release/7-3/ubi84/docker/Dockerfile
+++ b/release/7-3/ubi84/docker/Dockerfile
@@ -36,7 +36,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.3
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
 
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
diff --git a/release/7-3/ubi84/test-deps/docker/Dockerfile b/release/7-3/ubi84/test-deps/docker/Dockerfile
index c51396080..c4df646c2 100644
--- a/release/7-3/ubi84/test-deps/docker/Dockerfile
+++ b/release/7-3/ubi84/test-deps/docker/Dockerfile
@@ -16,7 +16,7 @@ RUN yum install -y \
     && yum clean all \
     && rm -rf /var/cache/yum
 
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.3
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
new file mode 100644
index 000000000..8def0791c
--- /dev/null
+++ b/release/7-3/ubi9/docker/Dockerfile
@@ -0,0 +1,61 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi9/ubi AS installer-env
+ARG PS_VERSION=7.3.0-preview.1
+ARG PACKAGE_VERSION=7.3.0_preview.1
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi9/ubi AS final-image
+ARG PS_VERSION=7.3.0-preview.1
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      openssl \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    && yum upgrade-minimal -y --security \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
+    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
+    OPENSSL_ENABLE_SHA1_SIGNATURES=1
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/7-3/ubi9/meta.json b/release/7-3/ubi9/meta.json
new file mode 100644
index 000000000..b65f0d6ed
--- /dev/null
+++ b/release/7-3/ubi9/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 9",
+    "ShortDistroName": "ubi",
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 502
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-3/ubi9/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..0c72d54ba
--- /dev/null
+++ b/release/7-3/ubi9/test-deps/docker/Dockerfile
@@ -0,0 +1,22 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        hostname \
+        iputils \
+        procps-ng \
+        git \
+        unzip \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/ubi9/test-deps/meta.json b/release/7-3/ubi9/test-deps/meta.json
new file mode 100644
index 000000000..3e8e5584d
--- /dev/null
+++ b/release/7-3/ubi9/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 9",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "tagTemplates": [
+        "ubi-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 502
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 1427f27c5..a6e2f82fe 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -249,9 +249,14 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             }
 
             $metadataString = Get-MetadataUsingContainer -Name $Name
-            $metadataString | Should -Not -BeNullOrEmpty
-            $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
-            $metadataJson | Select-Object -ExpandProperty StableReleaseTag | Should -Match '^v\d+\.\d+\.\d+.*$'
+            try {
+                $metadataString | Should -Not -BeNullOrEmpty
+                $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
+                $metadataJson | Select-Object -ExpandProperty StableReleaseTag | Should -Match '^v\d+\.\d+\.\d+.*$'
+            } catch {
+                Write-Verbose $metadataString -Verbose
+                throw
+            }
         }
 
         it "Get-UICulture from <Name> should return en-US" -TestCases $runTestCases -Skip:$script:skipLinuxRun {
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index e8c6b91bb..8cf1f64f8 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -156,6 +156,7 @@ function Get-ImageList
 
 enum DistributionState {
     Unknown
+    ImageCreation
     Validating
     Validated
     EndOfLife

From c545c357e2be5230d7bbffb20bc3f853ecfffc08 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 18 May 2022 17:58:41 -0700
Subject: [PATCH 200/354] Mark Ubuntu 22.04 as validated (#650)

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json
---
 release/7-2/mariner2/meta.json           | 2 +-
 release/7-2/mariner2/test-deps/meta.json | 2 +-
 release/7-2/ubuntu22.04/meta.json        | 2 +-
 release/7-3/ubuntu22.04/meta.json        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/7-2/mariner2/meta.json b/release/7-2/mariner2/meta.json
index 792ad0f10..209dea3cb 100644
--- a/release/7-2/mariner2/meta.json
+++ b/release/7-2/mariner2/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0 (Beta)",
+    "osVersion": "Mariner 2.0",
     "shortTags": [
         {"Tag": "2.0"}
     ],
diff --git a/release/7-2/mariner2/test-deps/meta.json b/release/7-2/mariner2/test-deps/meta.json
index e1e5267ee..4634502c0 100644
--- a/release/7-2/mariner2/test-deps/meta.json
+++ b/release/7-2/mariner2/test-deps/meta.json
@@ -2,7 +2,7 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0 (Beta)",
+    "osVersion": "Mariner 2.0",
     "tagTemplates": [
         "mariner-#shorttag#"
     ],
diff --git a/release/7-2/ubuntu22.04/meta.json b/release/7-2/ubuntu22.04/meta.json
index 328ab073d..f0b15f333 100644
--- a/release/7-2/ubuntu22.04/meta.json
+++ b/release/7-2/ubuntu22.04/meta.json
@@ -20,5 +20,5 @@
     },
     "SubImage": "test-deps",
     "EndOfLife": "2032-04-01",
-    "DistributionState": "Validating"
+    "DistributionState": "Validated"
 }
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
index 3dba66205..ff2a4c3c3 100644
--- a/release/7-3/ubuntu22.04/meta.json
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -17,5 +17,5 @@
     },
     "SubImage": "test-deps",
     "EndOfLife": "2023-12-15",
-    "DistributionState": "Validating"
+    "DistributionState": "Validated"
 }

From 2aa4f2094b3ed57cb940c0f58305bfcd5f2eccdd Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 May 2022 10:22:47 -0700
Subject: [PATCH 201/354] Create createReminder.yml

---
 .github/workflows/createReminder.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/createReminder.yml

diff --git a/.github/workflows/createReminder.yml b/.github/workflows/createReminder.yml
new file mode 100644
index 000000000..b779e19d5
--- /dev/null
+++ b/.github/workflows/createReminder.yml
@@ -0,0 +1,13 @@
+name: 'Create reminder'
+
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  reminder:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: check for reminder
+        uses: agrc/create-reminder-action@v1

From dd973b55ff47ec0fd820d1f192f458f201fe6a8b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 May 2022 10:25:58 -0700
Subject: [PATCH 202/354] Create processReminders.yml

---
 .github/workflows/processReminders.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/processReminders.yml

diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
new file mode 100644
index 000000000..140d07538
--- /dev/null
+++ b/.github/workflows/processReminders.yml
@@ -0,0 +1,13 @@
+name: 'check reminders'
+
+on:
+  schedule:
+    - cron: '*/15 * * * *'
+
+jobs:
+  reminder:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: check reminders and notify
+        uses: agrc/reminder-action@v1

From f830656a00a2498637944c0d8da56f7654203400 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 May 2022 10:26:48 -0700
Subject: [PATCH 203/354] Update processReminders.yml

---
 .github/workflows/processReminders.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
index 140d07538..640e24789 100644
--- a/.github/workflows/processReminders.yml
+++ b/.github/workflows/processReminders.yml
@@ -3,6 +3,7 @@ name: 'check reminders'
 on:
   schedule:
     - cron: '*/15 * * * *'
+  workflow_dispatch:
 
 jobs:
   reminder:

From 6f498a5231172c358e5fb4bcb3bde95f7487a938 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 May 2022 10:27:15 -0700
Subject: [PATCH 204/354] Update processReminders.yml

---
 .github/workflows/processReminders.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
index 640e24789..65322ebd7 100644
--- a/.github/workflows/processReminders.yml
+++ b/.github/workflows/processReminders.yml
@@ -1,4 +1,4 @@
-name: 'check reminders'
+name: 'Process reminders'
 
 on:
   schedule:

From 08c9e5446b0d5848b3e1bd97dadf235790f8aaf6 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 19 May 2022 16:36:55 -0700
Subject: [PATCH 205/354] Update to GA mariner 2.0 images (#651)

* Update to GA mariner 2.0 images

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update meta.json

* Update meta.json

* Update release/7-3/mariner2/test-deps/docker/Dockerfile

* Update release/7-2/mariner2/meta.json

* Update release/7-2/mariner2/test-deps/docker/Dockerfile

* Update meta.json
---
 release/7-2/mariner2/docker/Dockerfile           | 4 ++--
 release/7-2/mariner2/meta.json                   | 2 +-
 release/7-2/mariner2/test-deps/docker/Dockerfile | 2 ++
 release/7-2/mariner2/test-deps/meta.json         | 2 +-
 release/7-3/mariner2/docker/Dockerfile           | 4 ++--
 release/7-3/mariner2/test-deps/docker/Dockerfile | 2 ++
 release/7-3/mariner2/test-deps/meta.json         | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/release/7-2/mariner2/docker/Dockerfile b/release/7-2/mariner2/docker/Dockerfile
index 23737c242..b084f0e73 100644
--- a/release/7-2/mariner2/docker/Dockerfile
+++ b/release/7-2/mariner2/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM cblmariner2preview.azurecr.io/base/core:2.0 AS installer-env
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.2.3
@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
 ARG PS_VERSION=7.3.0-preview.1
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-2/mariner2/meta.json b/release/7-2/mariner2/meta.json
index 209dea3cb..a1cb1d607 100644
--- a/release/7-2/mariner2/meta.json
+++ b/release/7-2/mariner2/meta.json
@@ -9,7 +9,7 @@
     "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 450
+        "size": 760
     },
     "EndOfLife": "2022-10-14",
     "DistributionState": "Validating"
diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
index 86fc72dc7..4b8fb9db3 100644
--- a/release/7-2/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-2/mariner2/test-deps/docker/Dockerfile
@@ -21,6 +21,8 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     procps-ng \
     unzip \
     git \
+    mariner-repos-microsoft-preview \
+    net-tools \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
diff --git a/release/7-2/mariner2/test-deps/meta.json b/release/7-2/mariner2/test-deps/meta.json
index 4634502c0..222c298b0 100644
--- a/release/7-2/mariner2/test-deps/meta.json
+++ b/release/7-2/mariner2/test-deps/meta.json
@@ -12,6 +12,6 @@
         "test-deps-redhat"
     ],
     "TestProperties": {
-        "size": 610
+        "size": 760
     }
 }
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index f25c9c2e8..dda7d0139 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM cblmariner2preview.azurecr.io/base/core:2.0 AS installer-env
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.1
@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
 ARG PS_VERSION=7.3.0-preview.1
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
index 86fc72dc7..4b8fb9db3 100644
--- a/release/7-3/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-3/mariner2/test-deps/docker/Dockerfile
@@ -21,6 +21,8 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     procps-ng \
     unzip \
     git \
+    mariner-repos-microsoft-preview \
+    net-tools \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
diff --git a/release/7-3/mariner2/test-deps/meta.json b/release/7-3/mariner2/test-deps/meta.json
index 898d87f8a..222c298b0 100644
--- a/release/7-3/mariner2/test-deps/meta.json
+++ b/release/7-3/mariner2/test-deps/meta.json
@@ -12,6 +12,6 @@
         "test-deps-redhat"
     ],
     "TestProperties": {
-        "size": 544
+        "size": 760
     }
 }

From 8c47e1672b39ab868430eeb9430ac7aca8546d27 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 23 May 2022 12:00:28 -0700
Subject: [PATCH 206/354] Move mariner2 to FX Dependent package (#652)

* Move mariner2 to FX Dependent package

* remove marnier 1 and .NET is not publishing a package.
---
 release/7-3/mariner1/docker/Dockerfile        | 87 -------------------
 release/7-3/mariner1/meta.json                | 16 ----
 .../7-3/mariner1/test-deps/docker/Dockerfile  | 33 -------
 release/7-3/mariner1/test-deps/meta.json      | 17 ----
 release/7-3/mariner2/docker/Dockerfile        | 56 +++---------
 release/7-3/mariner2/meta.json                |  2 +-
 6 files changed, 11 insertions(+), 200 deletions(-)
 delete mode 100644 release/7-3/mariner1/docker/Dockerfile
 delete mode 100644 release/7-3/mariner1/meta.json
 delete mode 100644 release/7-3/mariner1/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/mariner1/test-deps/meta.json

diff --git a/release/7-3/mariner1/docker/Dockerfile b/release/7-3/mariner1/docker/Dockerfile
deleted file mode 100644
index 1fb7a02fd..000000000
--- a/release/7-3/mariner1/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
-
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
-
-# Install dependencies and clean up
-RUN tdnf update -y \
-    # install dependencies
-    && tdnf install -y \
-    # required for localization
-    icu \
-    # required for help in PowerShell
-    less \
-    # required for SSH
-    openssh-clients \
-    ca-certificates \
-    # upgrade packages
-    && tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all \
-    # remove cache folders and files
-    && rm -rf /var/cache/yum
-
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/7-3/mariner1/meta.json b/release/7-3/mariner1/meta.json
deleted file mode 100644
index cc44c165b..000000000
--- a/release/7-3/mariner1/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 1.0",
-    "shortTags": [
-        {"Tag": "1.0"}
-    ],
-    "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 387
-    },
-    "EndOfLife": "2022-10-14",
-    "DistributionState": "Validating"
-}
diff --git a/release/7-3/mariner1/test-deps/docker/Dockerfile b/release/7-3/mariner1/test-deps/docker/Dockerfile
deleted file mode 100644
index 481365ea8..000000000
--- a/release/7-3/mariner1/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    # install dependencies
-    && tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    # upgrade packages
-    && tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/mariner1/test-deps/meta.json b/release/7-3/mariner1/test-deps/meta.json
deleted file mode 100644
index a1a2a5369..000000000
--- a/release/7-3/mariner1/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 1.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 544
-    }
-}
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index dda7d0139..3135c4395 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -1,44 +1,11 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Install tar a gzip so we can unzip the tar.gz
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y \
-    tar \
-    gzip \
-    && tdnf clean all
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
-ARG PS_VERSION=7.3.0-preview.1
+ARG PS_VERSION=7.3.0-preview.4
 ARG PS_INSTALL_VERSION=7-preview
 
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -53,30 +20,27 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 
 # Install dependencies and clean up
 RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
+    tdnf install -y mariner-repos-microsoft-preview \
+    && tdnf update -y \
     # install dependencies
     && tdnf install -y \
-    # required for localization
-    icu \
     # required for help in PowerShell
     less \
     # required for SSH
     openssh-clients \
     ca-certificates \
+    powershell-preview \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
     && tdnf clean all
 
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+# Create the pwsh symbolic link that points to powershell
+RUN ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# intialize powershell module cache
+# and disable telemetry for this ONE session
+RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index 40f2958f8..c0a585371 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -12,5 +12,5 @@
         "size": 387
     },
     "EndOfLife": "2022-10-14",
-    "DistributionState": "Validating"
+    "DistributionState": "Validated"
 }

From 1c3b285c4d3ae6d22dfde83e4964e3a35e6c5627 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 15:09:59 -0700
Subject: [PATCH 207/354] Update the release build yaml with the latest
 versions (#653)

* Update the release build yaml with the latest versions

* fix ES tests

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: travis plunk <github@ez13.net>
---
 .vsts-ci/releasebuild.yml   | 2 +-
 unittests/build.tests.ps1   | 2 +-
 unittests/getTags.tests.ps1 | 2 +-
 unittests/test.tests.ps1    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 7e10beca6..6337e1c2e 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.3'
+    default: 'v7.3.0-preview.4'
   - name: 'ltsReleaseTag'
     default: 'v7.2.4'
   - name: 'stableReleaseTag'
diff --git a/unittests/build.tests.ps1 b/unittests/build.tests.ps1
index e220210fa..3be6c09b4 100644
--- a/unittests/build.tests.ps1
+++ b/unittests/build.tests.ps1
@@ -15,7 +15,7 @@ Describe "buildps1-Build" {
     }
     Context "-Channel -Name" {
         It "Should invoke pester" {
-            & $buildScript -Build -Name "mariner1" -Channel preview 4>&1 | out-null
+            & $buildScript -Build -Name "ubuntu22.04" -Channel preview 4>&1 | out-null
             Assert-MockCalled -CommandName "Invoke-PesterWrapper" -Times 1
             Assert-MockCalled -CommandName "Set-BuildVariable" -Times 1
         }
diff --git a/unittests/getTags.tests.ps1 b/unittests/getTags.tests.ps1
index 451ee16ac..1d6b9db15 100644
--- a/unittests/getTags.tests.ps1
+++ b/unittests/getTags.tests.ps1
@@ -10,7 +10,7 @@ Describe "build.ps1 -GetTags" {
 
     Context "-Channel -Name" {
         It "Should invoke pester" {
-            & $buildScript -GetTags -Name 'mariner1' -Channel preview -Version v7.2.2 4>&1 | out-null
+            & $buildScript -GetTags -Name 'ubuntu22.04' -Channel preview -Version v7.2.2 4>&1 | out-null
         }
         It "throw for non existant image" {
             [Type] $exceptionType = [System.Management.Automation.ParameterBindingException]
diff --git a/unittests/test.tests.ps1 b/unittests/test.tests.ps1
index 55fcb7c83..421e1bba3 100644
--- a/unittests/test.tests.ps1
+++ b/unittests/test.tests.ps1
@@ -12,7 +12,7 @@ Describe "build.ps1 -Test" {
     }
     Context "-Channel -Name" {
         It "Should invoke pester" {
-            & $buildScript -Test -Pull -ImageName "unittest" -Name 'mariner1' -Channel preview -Version v7.2.2 4>&1 | out-null
+            & $buildScript -Test -Pull -ImageName "unittest" -Name 'ubuntu22.04' -Channel preview -Version v7.2.2 4>&1 | out-null
             Assert-VerifiableMock
         }
         It "throw for non existant image" {

From d2ea0445294e3ae9d067108ed33998239522cc1b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 24 May 2022 17:08:20 -0700
Subject: [PATCH 208/354] Remove EOL distributions (#654)

---
 .github/workflows/rebase.yml                  | 18 +++-
 release/7-2/fedora34/docker/Dockerfile        | 61 -------------
 release/7-2/fedora34/meta.json                | 20 -----
 .../7-2/fedora34/test-deps/docker/Dockerfile  | 23 -----
 release/7-2/fedora34/test-deps/meta.json      | 15 ----
 release/7-2/nanoserver20H2/docker/Dockerfile  | 90 -------------------
 release/7-2/nanoserver20H2/meta.json          | 21 -----
 .../windowsservercore20H2/docker/Dockerfile   | 70 ---------------
 release/7-2/windowsservercore20H2/meta.json   | 21 -----
 release/7-3/fedora34/docker/Dockerfile        | 62 -------------
 release/7-3/fedora34/meta.json                | 17 ----
 .../7-3/fedora34/test-deps/docker/Dockerfile  | 23 -----
 release/7-3/fedora34/test-deps/meta.json      | 15 ----
 release/7-3/nanoserver20H2/docker/Dockerfile  | 87 ------------------
 release/7-3/nanoserver20H2/meta.json          | 18 ----
 .../windowsservercore20H2/docker/Dockerfile   | 67 --------------
 release/7-3/windowsservercore20H2/meta.json   | 18 ----
 17 files changed, 16 insertions(+), 630 deletions(-)
 delete mode 100644 release/7-2/fedora34/docker/Dockerfile
 delete mode 100644 release/7-2/fedora34/meta.json
 delete mode 100644 release/7-2/fedora34/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/fedora34/test-deps/meta.json
 delete mode 100644 release/7-2/nanoserver20H2/docker/Dockerfile
 delete mode 100644 release/7-2/nanoserver20H2/meta.json
 delete mode 100644 release/7-2/windowsservercore20H2/docker/Dockerfile
 delete mode 100644 release/7-2/windowsservercore20H2/meta.json
 delete mode 100644 release/7-3/fedora34/docker/Dockerfile
 delete mode 100644 release/7-3/fedora34/meta.json
 delete mode 100644 release/7-3/fedora34/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/fedora34/test-deps/meta.json
 delete mode 100644 release/7-3/nanoserver20H2/docker/Dockerfile
 delete mode 100644 release/7-3/nanoserver20H2/meta.json
 delete mode 100644 release/7-3/windowsservercore20H2/docker/Dockerfile
 delete mode 100644 release/7-3/windowsservercore20H2/meta.json

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index ff88a2ed3..f610e1b53 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -1,4 +1,7 @@
-on: 
+# This cannot rebase workflow changes into a PR
+# It also only works if the GITHUB_TOKEN has permission to push to the branch
+# see: https://github.com/cirrus-actions/rebase/issues/12#issuecomment-632594995
+on:
   issue_comment:
     types: [created]
 name: Automatic Rebase
@@ -12,7 +15,18 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - name: Post rebase started comment to pull request
+      uses: actions/github-script@v3
+      with:
+        script: |
+          const backport_start_body = `Started rebase: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+          await github.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.4
+      uses: cirrus-actions/rebase@1.6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/release/7-2/fedora34/docker/Dockerfile b/release/7-2/fedora34/docker/Dockerfile
deleted file mode 100644
index 9e9a08be3..000000000
--- a/release/7-2/fedora34/docker/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes Fedora 34 image with PowerShell installed from Microsoft YUM Repo
-ARG imageRepo=fedora
-
-FROM ${imageRepo}:34 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-34
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && echo "starting misc packages" \
-    && dnf install -y \
-    # less is needed for help
-      less \
-    # Needed to run localdef
-      glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-      openssl-libs \
-      ca-certificates \
-      gssntlmssp \
-    && echo "end - misc packages" \
-    # This installs most security advisories
-    && echo "starting upgrade minimal" \
-    && dnf upgrade-minimal -y --security \
-    && echo "end - upgrade minimal" \
-    && echo "verifying all security advisories are installed..." \
-    && dnf updateinfo list -q --security \
-    && echo "end - verifying all security advisories are installed..." \
-    && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/fedora34/meta.json b/release/7-2/fedora34/meta.json
deleted file mode 100644
index 00d4b2b00..000000000
--- a/release/7-2/fedora34/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "Fedora 34",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-fedora-34",
-        "fedora-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "34"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 632
-    },
-    "EndOfLife": "2022-05-17",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-2/fedora34/test-deps/docker/Dockerfile b/release/7-2/fedora34/test-deps/docker/Dockerfile
deleted file mode 100644
index b6b41b8d7..000000000
--- a/release/7-2/fedora34/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:fedora-34
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps \
-        findutils \
-        unzip \
-        git \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/fedora34/test-deps/meta.json b/release/7-2/fedora34/test-deps/meta.json
deleted file mode 100644
index 86fed226d..000000000
--- a/release/7-2/fedora34/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "osVersion": "Fedora 34",
-    "tagTemplates": [
-        "fedora-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/7-2/nanoserver20H2/docker/Dockerfile b/release/7-2/nanoserver20H2/docker/Dockerfile
deleted file mode 100644
index db84868ed..000000000
--- a/release/7-2/nanoserver20H2/docker/Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-2/nanoserver20H2/meta.json b/release/7-2/nanoserver20H2/meta.json
deleted file mode 100644
index 5bc868741..000000000
--- a/release/7-2/nanoserver20H2/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "tagTemplates": [
-        "#psversion#-nanoserver-#shorttag#",
-        "nanoserver-#shorttag#"
-    ],
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-2/windowsservercore20H2/docker/Dockerfile b/release/7-2/windowsservercore20H2/docker/Dockerfile
deleted file mode 100644
index 247cd3fef..000000000
--- a/release/7-2/windowsservercore20H2/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# escape=`
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-2/windowsservercore20H2/meta.json b/release/7-2/windowsservercore20H2/meta.json
deleted file mode 100644
index 3f08b5e8d..000000000
--- a/release/7-2/windowsservercore20H2/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "tagTemplates": [
-        "#psversion#-windowsservercore-#shorttag#",
-        "windowsservercore-#shorttag#"
-    ],
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/fedora34/docker/Dockerfile b/release/7-3/fedora34/docker/Dockerfile
deleted file mode 100644
index be563ee9e..000000000
--- a/release/7-3/fedora34/docker/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes Fedora 34 image with PowerShell installed from Microsoft YUM Repo
-ARG imageRepo=fedora
-
-FROM ${imageRepo}:34 AS installer-env
-
-ARG PS_VERSION=7.0.0
-ARG PACKAGE_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-32
-
-# Install dependencies and clean up
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
-    && dnf install -y /tmp/powershell.rpm \
-    # remove powershell package
-    && rm /tmp/powershell.rpm \
-    && echo "starting misc packages" \
-    && dnf install -y \
-    # less is needed for help
-      less \
-    # Needed to run localdef
-      glibc-locale-source \
-    # Invoke-WebRequest doesn't work correctly without this
-      openssl-libs \
-      ca-certificates \
-      gssntlmssp \
-    && echo "end - misc packages" \
-    && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
-    # This installs most security advisories
-    && echo "starting upgrade minimal" \
-    && dnf upgrade-minimal -y --security \
-    && echo "end - upgrade minimal" \
-    && echo "verifying all security advisories are installed..." \
-    && dnf updateinfo list -q --security \
-    && echo "end - verifying all security advisories are installed..." \
-    && dnf clean all \
-    && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    # intialize powershell module cache
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/fedora34/meta.json b/release/7-3/fedora34/meta.json
deleted file mode 100644
index d56d9fa2d..000000000
--- a/release/7-3/fedora34/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "osVersion": "Fedora 34",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "fedora",
-    "shortTags": [
-        {"Tag": "34"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 632
-    },
-    "EndOfLife": "2022-05-17",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/fedora34/test-deps/docker/Dockerfile b/release/7-3/fedora34/test-deps/docker/Dockerfile
deleted file mode 100644
index a4402242a..000000000
--- a/release/7-3/fedora34/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Fedora32 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:preview-fedora-34
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN dnf install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps \
-        findutils \
-        unzip \
-        git \
-    && dnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Fedora-34
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/fedora34/test-deps/meta.json b/release/7-3/fedora34/test-deps/meta.json
deleted file mode 100644
index 86fed226d..000000000
--- a/release/7-3/fedora34/test-deps/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "osVersion": "Fedora 34",
-    "tagTemplates": [
-        "fedora-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 632
-    }
-}
diff --git a/release/7-3/nanoserver20H2/docker/Dockerfile b/release/7-3/nanoserver20H2/docker/Dockerfile
deleted file mode 100644
index 791221f67..000000000
--- a/release/7-3/nanoserver20H2/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# escape=`
-# Args used by from statements must be defined here:
-ARG InstallerVersion=nanoserver
-ARG InstallerRepo=mcr.microsoft.com/powershell
-ARG NanoServerRepo=mcr.microsoft.com/windows/nanoserver
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${InstallerRepo}:$InstallerVersion  AS installer-env
-
-# Arguments for installing PowerShell, must be defined in the container they are used
-ARG PS_VERSION=7.0.0-rc.1
-
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$PS_VERSION/PowerShell-$PS_VERSION-win-x64.zip
-
-SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# disable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="1"
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    New-Item -ItemType Directory /installer > $null ; `
-    Invoke-WebRequest -Uri $url -outfile /installer/powershell.zip -verbose; `
-    Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
-
-# Install PowerShell into NanoServer
-FROM ${NanoServerRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    # Set the default windows path so we can use it
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-NanoServer-20H2"
-
-### Begin workaround ###
-# Note that changing user on nanoserver is not recommended
-# See, https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-base-images#base-image-differences
-# But we are working around a bug introduced in the nanoserver image introduced in 1809
-# Without this, PowerShell Direct will fail
-# this command sholud be like this: https://github.com/PowerShell/PowerShell-Docker/blob/f81009c42c96af46aef81eb1515efae0ef29ad5f/release/preview/nanoserver/docker/Dockerfile#L76
-USER ContainerAdministrator
-
-# This is basically the correct code except for the /M
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;" /M
-
-USER ContainerUser
-### End workaround ###
-
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-3/nanoserver20H2/meta.json b/release/7-3/nanoserver20H2/meta.json
deleted file mode 100644
index 7e55c181b..000000000
--- a/release/7-3/nanoserver20H2/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Nano Server, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "ShortDistroName": "nanoserver",
-    "Base64EncodePackageUrl": true,
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-3/windowsservercore20H2/docker/Dockerfile b/release/7-3/windowsservercore20H2/docker/Dockerfile
deleted file mode 100644
index ffce740be..000000000
--- a/release/7-3/windowsservercore20H2/docker/Dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-# escape=`
-ARG WindowsServerCoreRepo=mcr.microsoft.com/windows/servercore
-
-# Use server core as an installer container to extract PowerShell,
-# As this is a multi-stage build, this stage will eventually be thrown away
-FROM ${WindowsServerCoreRepo}:20H2 AS installer-env
-
-ARG PS_VERSION=7.0.0-preview.1
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
-
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN Write-host "Verifying valid Version..."; `
-    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
-        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
-    } `
-    $ProgressPreference = 'SilentlyContinue'; `
-    if($env:PS_PACKAGE_URL_BASE64){ `
-        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
-        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
-    } else { `
-        Write-host "using url: $env:PS_PACKAGE_URL" ;`
-        $url = $env:PS_PACKAGE_URL `
-    } `
-    Write-host "downloading: $url"; `
-    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
-    Expand-Archive powershell.zip -DestinationPath  \PowerShell
-
-# Install PowerShell into WindowsServerCore
-FROM ${WindowsServerCoreRepo}:20H2
-
-# Copy PowerShell Core from the installer container
-ENV ProgramFiles="C:\Program Files" `
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
-    # Persist %PSCORE% ENV variable for user convenience
-    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
-    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-20H2" `
-    POWERSHELL_TELEMETRY_OPTOUT="1"
-
-# Copy PowerShell Core from the installer container
-COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
-
-# Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
-
-# intialize powershell module cache
-RUN pwsh `
-        -NoLogo `
-        -NoProfile `
-        -Command " `
-          $stopTime = (get-date).AddMinutes(15); `
-          $ErrorActionPreference = 'Stop' ; `
-          $ProgressPreference = 'SilentlyContinue' ; `
-          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
-            if((get-date) -gt $stopTime) { throw 'timout expired'} `
-            Start-Sleep -Seconds 6 ; `
-          }"
-
-# re-enable telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT="0"
-
-CMD ["pwsh.exe"]
diff --git a/release/7-3/windowsservercore20H2/meta.json b/release/7-3/windowsservercore20H2/meta.json
deleted file mode 100644
index 4a6a0bc2e..000000000
--- a/release/7-3/windowsservercore20H2/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux": false,
-    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
-    "osVersion": "Windows Server Core, version 20H2",
-    "shortTags": [
-        {
-            "Tag": "20H2"
-        }
-    ],
-    "Base64EncodePackageUrl": true,
-    "ShortDistroName": "windowsservercore",
-    "TestProperties": {
-        "size": 1
-    },
-    "UseAcr": true,
-    "EndOfLife": "2022-05-10",
-    "DistributionState": "Validated"
-}

From 62b5aa9d280b850c09fcae10a48895c581f6bdd4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 May 2022 14:32:41 -0700
Subject: [PATCH 209/354] Keep matrix json up to date (#658)

* Update workflow to keep matrix json up to date

* fix task name
---
 .github/workflows/update.yml |  27 +
 assets/matrix.json           | 992 +++++++++++++++++++++++++++++++++++
 2 files changed, 1019 insertions(+)
 create mode 100644 assets/matrix.json

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index ee070dfd0..7e8c1af89 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -50,3 +50,30 @@ jobs:
           base: master
           draft: false
           branch: update-release-build
+  update-matrix-json:
+    name: Update Matrix Json
+    timeout-minutes: 15
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Auto-update JSON
+        run: |
+          .\build.ps1 -GenerateMatrixJson -FullJson -Channel preview, stable > .\assets\matrix.json
+      - name: Create Pull Request
+        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+        id: cpr
+        uses: peter-evans/create-pull-request@v3
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          commit-message: "Update the matrix json"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update the matrix json"
+          assignees: travisez13
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-matrix-json
diff --git a/assets/matrix.json b/assets/matrix.json
new file mode 100644
index 000000000..1990729a0
--- /dev/null
+++ b/assets/matrix.json
@@ -0,0 +1,992 @@
+{
+  "preview": [
+    {
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": false,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "JobName": "alpine315"
+    },
+    {
+      "TagList": "preview-ubi-8.4",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84\\test-deps",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "ImageCreation",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "JobName": "ubi9"
+    },
+    {
+      "TagList": "preview-mariner-2.0",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6864855-07:00",
+      "ImageName": "mariner2\\test-deps",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "JobName": "mariner2\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "JobName": "mariner2"
+    },
+    {
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
+      "OsVersion": "Debian 10",
+      "JobName": "debian10"
+    },
+    {
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": false,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "JobName": "alpine313"
+    },
+    {
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": false,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "JobName": "alpine314"
+    },
+    {
+      "TagList": "preview-ubi-9",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "ImageCreation",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9\\test-deps",
+      "OsVersion": "Universal Base Image 9",
+      "JobName": "ubi9\\test_deps"
+    },
+    {
+      "TagList": "preview-debian-bullseye-slim;preview-debian-11",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6839755-07:00",
+      "ImageName": "debian11\\test-deps",
+      "OsVersion": "Debian 11 (Testing) (In Validation)",
+      "JobName": "debian11\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "JobName": "ubuntu22.04"
+    },
+    {
+      "TagList": "preview-alpine-3.13",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6693137-07:00",
+      "ImageName": "alpine313\\test-deps",
+      "OsVersion": "Alpine 3.13 (In Validation)",
+      "JobName": "alpine313\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84"
+    },
+    {
+      "TagList": "preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6996697-07:00",
+      "ImageName": "ubuntu22.04\\test-deps",
+      "OsVersion": "Ubuntu 22.04 (In Validation)",
+      "JobName": "ubuntu22.04\\test_deps"
+    },
+    {
+      "TagList": "preview-debian-buster-slim;preview-debian-10",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6813097-07:00",
+      "ImageName": "debian10\\test-deps",
+      "OsVersion": "Debian 10 (In Validation)",
+      "JobName": "debian10\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": false,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "JobName": "ubuntu20.04"
+    },
+    {
+      "TagList": "preview-alpine-3.14",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6720702-07:00",
+      "ImageName": "alpine314\\test-deps",
+      "OsVersion": "Alpine 3.14 (In Validation)",
+      "JobName": "alpine314\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
+      "OsVersion": "Debian 11",
+      "JobName": "debian11"
+    },
+    {
+      "TagList": "preview-ubuntu-focal;preview-ubuntu-20.04",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.696919-07:00",
+      "ImageName": "ubuntu20.04\\test-deps",
+      "OsVersion": "Ubuntu 20.04 (In Validation)",
+      "JobName": "ubuntu20.04\\test_deps"
+    },
+    {
+      "TagList": "preview-alpine-3.15",
+      "Channel": "preview",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6747643-07:00",
+      "ImageName": "alpine315\\test-deps",
+      "OsVersion": "Alpine 3.14 (In Validation)",
+      "JobName": "alpine315\\test_deps"
+    },
+    {
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "Channel": "preview",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022"
+    },
+    {
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "Channel": "preview",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "JobName": "nanoserver1809"
+    },
+    {
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "Channel": "preview",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "windowsservercore2022"
+    },
+    {
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "Channel": "preview",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "nanoserver2022"
+    }
+  ],
+  "stable": [
+    {
+      "TagList": "ubuntu-focal;ubuntu-20.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6580485-07:00",
+      "ImageName": "ubuntu20.04\\test-deps",
+      "OsVersion": "Ubuntu 20.04 (In Validation)",
+      "JobName": "ubuntu20.04\\test_deps"
+    },
+    {
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84\\test-deps",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84\\test_deps"
+    },
+    {
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "JobName": "alpine314"
+    },
+    {
+      "TagList": "mariner-1.0;7.2-mariner-1.0",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner1",
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "JobName": "mariner1"
+    },
+    {
+      "TagList": "mariner-2.0",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6411286-07:00",
+      "ImageName": "mariner2\\test-deps",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "JobName": "mariner2\\test_deps"
+    },
+    {
+      "TagList": "debian-stretch-slim;debian-9",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6346714-07:00",
+      "ImageName": "debian9\\test-deps",
+      "OsVersion": "Debian 9 (In Validation)",
+      "JobName": "debian9\\test_deps"
+    },
+    {
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "JobName": "mariner2"
+    },
+    {
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
+      "OsVersion": "Debian 10",
+      "JobName": "debian10"
+    },
+    {
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "JobName": "alpine313"
+    },
+    {
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "JobName": "ubuntu18.04"
+    },
+    {
+      "TagList": "ubuntu-xenial;ubuntu-16.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6520474-07:00",
+      "ImageName": "ubuntu16.04\\test-deps",
+      "OsVersion": "Ubuntu 16.04 (In Validation)",
+      "JobName": "ubuntu16.04\\test_deps"
+    },
+    {
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "JobName": "arm32v7"
+    },
+    {
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "JobName": "ubuntu22.04"
+    },
+    {
+      "TagList": "ubuntu-bionic;ubuntu-18.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6553033-07:00",
+      "ImageName": "ubuntu18.04\\test-deps",
+      "OsVersion": "Ubuntu 18.04 (In Validation)",
+      "JobName": "ubuntu18.04\\test_deps"
+    },
+    {
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "OsVersion": "Debian 9",
+      "JobName": "debian9"
+    },
+    {
+      "TagList": "alpine-3.13",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6214059-07:00",
+      "ImageName": "alpine313\\test-deps",
+      "OsVersion": "Alpine 3.13 (In Validation)",
+      "JobName": "alpine313\\test_deps"
+    },
+    {
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84"
+    },
+    {
+      "TagList": "ubuntu-jammy;ubuntu-22.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.66069-07:00",
+      "ImageName": "ubuntu22.04\\test-deps",
+      "OsVersion": "Ubuntu 22.04 (In Validation)",
+      "JobName": "ubuntu22.04\\test_deps"
+    },
+    {
+      "TagList": "debian-buster-slim;debian-10",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6284616-07:00",
+      "ImageName": "debian10\\test-deps",
+      "OsVersion": "Debian 10 (In Validation)",
+      "JobName": "debian10\\test_deps"
+    },
+    {
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "JobName": "ubuntu20.04"
+    },
+    {
+      "TagList": "alpine-3.14",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6244169-07:00",
+      "ImageName": "alpine314\\test-deps",
+      "OsVersion": "Alpine 3.14 (In Validation)",
+      "JobName": "alpine314\\test_deps"
+    },
+    {
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
+      "OsVersion": "Debian 11",
+      "JobName": "debian11"
+    },
+    {
+      "TagList": "mariner-1.0",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6379923-07:00",
+      "ImageName": "mariner1\\test-deps",
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "JobName": "mariner1\\test_deps"
+    },
+    {
+      "TagList": "debian-bullseye-slim;debian-11",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.6313088-07:00",
+      "ImageName": "debian11\\test-deps",
+      "OsVersion": "Debian 11 (Testing) (In Validation)",
+      "JobName": "debian11\\test_deps"
+    },
+    {
+      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
+      "Channel": "stable",
+      "IsLinux": true,
+      "DistributionState": "EndOfLife",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ImageName": "ubuntu16.04",
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "JobName": "ubuntu16.04"
+    },
+    {
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "Channel": "stable",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022"
+    },
+    {
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "Channel": "stable",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "JobName": "nanoserver1809"
+    },
+    {
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "Channel": "stable",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "windowsservercore2022"
+    },
+    {
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "Channel": "stable",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "nanoserver2022"
+    }
+  ],
+  "lts": [
+    {
+      "TagList": "lts-ubuntu-focal;lts-ubuntu-20.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7384281-07:00",
+      "ImageName": "ubuntu20.04\\test-deps",
+      "OsVersion": "Ubuntu 20.04 (In Validation)",
+      "JobName": "ubuntu20.04\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84\\test-deps",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "JobName": "alpine314"
+    },
+    {
+      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner1",
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "JobName": "mariner1"
+    },
+    {
+      "TagList": "lts-mariner-2.0",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7244152-07:00",
+      "ImageName": "mariner2\\test-deps",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "JobName": "mariner2\\test_deps"
+    },
+    {
+      "TagList": "lts-debian-stretch-slim;lts-debian-9",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7195271-07:00",
+      "ImageName": "debian9\\test-deps",
+      "OsVersion": "Debian 9 (In Validation)",
+      "JobName": "debian9\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "JobName": "mariner2"
+    },
+    {
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
+      "OsVersion": "Debian 10",
+      "JobName": "debian10"
+    },
+    {
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "JobName": "alpine313"
+    },
+    {
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "JobName": "ubuntu18.04"
+    },
+    {
+      "TagList": "lts-ubuntu-xenial;lts-ubuntu-16.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7333554-07:00",
+      "ImageName": "ubuntu16.04\\test-deps",
+      "OsVersion": "Ubuntu 16.04 (In Validation)",
+      "JobName": "ubuntu16.04\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "JobName": "arm32v7"
+    },
+    {
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "JobName": "ubuntu22.04"
+    },
+    {
+      "TagList": "lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.735916-07:00",
+      "ImageName": "ubuntu18.04\\test-deps",
+      "OsVersion": "Ubuntu 18.04 (In Validation)",
+      "JobName": "ubuntu18.04\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "OsVersion": "Debian 9",
+      "JobName": "debian9"
+    },
+    {
+      "TagList": "lts-alpine-3.13",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.70807-07:00",
+      "ImageName": "alpine313\\test-deps",
+      "OsVersion": "Alpine 3.13 (In Validation)",
+      "JobName": "alpine313\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validating",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi84"
+    },
+    {
+      "TagList": "lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7409169-07:00",
+      "ImageName": "ubuntu22.04\\test-deps",
+      "OsVersion": "Ubuntu 22.04 (In Validation)",
+      "JobName": "ubuntu22.04\\test_deps"
+    },
+    {
+      "TagList": "lts-debian-buster-slim;lts-debian-10",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7145106-07:00",
+      "ImageName": "debian10\\test-deps",
+      "OsVersion": "Debian 10 (In Validation)",
+      "JobName": "debian10\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "JobName": "ubuntu20.04"
+    },
+    {
+      "TagList": "lts-alpine-3.14",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.710577-07:00",
+      "ImageName": "alpine314\\test-deps",
+      "OsVersion": "Alpine 3.14 (In Validation)",
+      "JobName": "alpine314\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
+      "OsVersion": "Debian 11",
+      "JobName": "debian11"
+    },
+    {
+      "TagList": "lts-mariner-1.0",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7219804-07:00",
+      "ImageName": "mariner1\\test-deps",
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "JobName": "mariner1\\test_deps"
+    },
+    {
+      "TagList": "lts-debian-bullseye-slim;lts-debian-11",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "Unknown",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2022-06-07T14:24:08.7170415-07:00",
+      "ImageName": "debian11\\test-deps",
+      "OsVersion": "Debian 11 (Testing) (In Validation)",
+      "JobName": "debian11\\test_deps"
+    },
+    {
+      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
+      "Channel": "lts",
+      "IsLinux": true,
+      "DistributionState": "EndOfLife",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ImageName": "ubuntu16.04",
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "JobName": "ubuntu16.04"
+    },
+    {
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "Channel": "lts",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022"
+    },
+    {
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "Channel": "lts",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "JobName": "nanoserver1809"
+    },
+    {
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "Channel": "lts",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "windowsservercore2022"
+    },
+    {
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "Channel": "lts",
+      "IsLinux": false,
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "ContinueOnError": false,
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "nanoserver2022"
+    }
+  ]
+}

From f95abd8f47f11b05454ec660a2f7d92fde0e2d8a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 May 2022 16:24:32 -0700
Subject: [PATCH 210/354] Make matrix JSON consistent (#660)

---
 build.ps1                          | 2 +-
 tools/buildHelper/buildHelper.psm1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.ps1 b/build.ps1
index f61242251..676337f2c 100755
--- a/build.ps1
+++ b/build.ps1
@@ -632,7 +632,7 @@ End {
 
         foreach ($channelName in $matrix.Keys) {
             $fullMatrix[$channelName] = @()
-            foreach ($osName in $matrix.$channelName.Keys) {
+            foreach ($osName in $matrix.$channelName.Keys | Sort-Object) {
                 $osMatrix = $matrix.$channelName.$osName
                 $fullMatrix[$channelName] += $osMatrix.Values
                 $matrixJson = $osMatrix | ConvertTo-Json -Compress
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 8cf1f64f8..b7ec28c5d 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -254,7 +254,7 @@ class DockerImageMetaData {
     $IsPrivate = $false
 
     [datetime]
-    $EndOfLife = (Get-Date).AddDays(7)
+    $EndOfLife = (Get-Date).Date.AddDays(7)
 
     [DistributionState]
     $DistributionState =[DistributionState]::Unknown

From 08ba12c6995e0eb82da085f6f403964152349b98 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 16:30:06 -0700
Subject: [PATCH 211/354] Update the matrix json (#659)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 1108 ++++++++++++++------------------------------
 1 file changed, 350 insertions(+), 758 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 1990729a0..2ee166d29 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,991 +1,583 @@
 {
-  "preview": [
-    {
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "UseInCI": false,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "JobName": "alpine315"
-    },
-    {
-      "TagList": "preview-ubi-8.4",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84\\test-deps",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "ImageCreation",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "JobName": "ubi9"
-    },
-    {
-      "TagList": "preview-mariner-2.0",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6864855-07:00",
-      "ImageName": "mariner2\\test-deps",
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "JobName": "mariner2\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "JobName": "mariner2"
-    },
+  "lts": [
     {
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "Channel": "preview",
-      "IsLinux": true,
+      "OsVersion": "Debian 11",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
-      "OsVersion": "Debian 10",
-      "JobName": "debian10"
-    },
-    {
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "Channel": "preview",
       "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": false,
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "ImageName": "debian11",
       "ContinueOnError": false,
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "JobName": "alpine313"
+      "Channel": "lts",
+      "JobName": "debian11"
     },
     {
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": false,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "JobName": "alpine314"
-    },
-    {
-      "TagList": "preview-ubi-9",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "ImageCreation",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9\\test-deps",
-      "OsVersion": "Universal Base Image 9",
-      "JobName": "ubi9\\test_deps"
-    },
-    {
-      "TagList": "preview-debian-bullseye-slim;preview-debian-11",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6839755-07:00",
-      "ImageName": "debian11\\test-deps",
-      "OsVersion": "Debian 11 (Testing) (In Validation)",
-      "JobName": "debian11\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "JobName": "ubuntu22.04"
-    },
-    {
-      "TagList": "preview-alpine-3.13",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6693137-07:00",
-      "ImageName": "alpine313\\test-deps",
-      "OsVersion": "Alpine 3.13 (In Validation)",
-      "JobName": "alpine313\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84"
-    },
-    {
-      "TagList": "preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6996697-07:00",
-      "ImageName": "ubuntu22.04\\test-deps",
-      "OsVersion": "Ubuntu 22.04 (In Validation)",
-      "JobName": "ubuntu22.04\\test_deps"
-    },
-    {
-      "TagList": "preview-debian-buster-slim;preview-debian-10",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6813097-07:00",
-      "ImageName": "debian10\\test-deps",
-      "OsVersion": "Debian 10 (In Validation)",
-      "JobName": "debian10\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": false,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "JobName": "ubuntu20.04"
-    },
-    {
-      "TagList": "preview-alpine-3.14",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6720702-07:00",
-      "ImageName": "alpine314\\test-deps",
-      "OsVersion": "Alpine 3.14 (In Validation)",
-      "JobName": "alpine314\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
-      "Channel": "preview",
-      "IsLinux": true,
+      "EndOfLife": "2023-05-01T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
-      "OsVersion": "Debian 11",
-      "JobName": "debian11"
-    },
-    {
-      "TagList": "preview-ubuntu-focal;preview-ubuntu-20.04",
-      "Channel": "preview",
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.696919-07:00",
-      "ImageName": "ubuntu20.04\\test-deps",
-      "OsVersion": "Ubuntu 20.04 (In Validation)",
-      "JobName": "ubuntu20.04\\test_deps"
-    },
-    {
-      "TagList": "preview-alpine-3.15",
-      "Channel": "preview",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6747643-07:00",
-      "ImageName": "alpine315\\test-deps",
-      "OsVersion": "Alpine 3.14 (In Validation)",
-      "JobName": "alpine315\\test_deps"
-    },
-    {
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
-      "Channel": "preview",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "JobName": "windowsserver2022"
-    },
-    {
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
-      "Channel": "preview",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "JobName": "nanoserver1809"
-    },
-    {
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "Channel": "preview",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "UseInCI": true,
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "ImageName": "alpine314",
       "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "JobName": "windowsservercore2022"
+      "Channel": "lts",
+      "JobName": "alpine314"
     },
     {
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
-      "Channel": "preview",
-      "IsLinux": false,
+      "OsVersion": "Alpine 3.13",
+      "EndOfLife": "2022-11-01T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "JobName": "nanoserver2022"
-    }
-  ],
-  "stable": [
-    {
-      "TagList": "ubuntu-focal;ubuntu-20.04",
-      "Channel": "stable",
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "ImageName": "alpine313",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6580485-07:00",
-      "ImageName": "ubuntu20.04\\test-deps",
-      "OsVersion": "Ubuntu 20.04 (In Validation)",
-      "JobName": "ubuntu20.04\\test_deps"
+      "Channel": "lts",
+      "JobName": "alpine313"
     },
     {
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "Channel": "stable",
-      "IsLinux": true,
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "EndOfLife": "2022-10-14T00:00:00",
       "DistributionState": "Validating",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84\\test-deps",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84\\test_deps"
-    },
-    {
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "Channel": "stable",
       "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "JobName": "alpine314"
-    },
-    {
-      "TagList": "mariner-1.0;7.2-mariner-1.0",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-10-14T00:00:00",
+      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
       "ImageName": "mariner1",
-      "OsVersion": "Mariner 1.0 (In Validation)",
+      "ContinueOnError": false,
+      "Channel": "lts",
       "JobName": "mariner1"
     },
     {
-      "TagList": "mariner-2.0",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6411286-07:00",
-      "ImageName": "mariner2\\test-deps",
       "OsVersion": "Mariner 2.0 (In Validation)",
-      "JobName": "mariner2\\test_deps"
-    },
-    {
-      "TagList": "debian-stretch-slim;debian-9",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6346714-07:00",
-      "ImageName": "debian9\\test-deps",
-      "OsVersion": "Debian 9 (In Validation)",
-      "JobName": "debian9\\test_deps"
-    },
-    {
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
-      "Channel": "stable",
-      "IsLinux": true,
+      "EndOfLife": "2022-10-14T00:00:00",
       "DistributionState": "Validating",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "JobName": "mariner2"
-    },
-    {
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "Channel": "stable",
       "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
-      "OsVersion": "Debian 10",
-      "JobName": "debian10"
-    },
-    {
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "ImageName": "mariner2",
       "ContinueOnError": false,
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "JobName": "alpine313"
+      "Channel": "lts",
+      "JobName": "mariner2"
     },
     {
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
       "OsVersion": "Ubuntu 18.04",
-      "JobName": "ubuntu18.04"
-    },
-    {
-      "TagList": "ubuntu-xenial;ubuntu-16.04",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6520474-07:00",
-      "ImageName": "ubuntu16.04\\test-deps",
-      "OsVersion": "Ubuntu 16.04 (In Validation)",
-      "JobName": "ubuntu16.04\\test_deps"
-    },
-    {
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "JobName": "arm32v7"
-    },
-    {
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "Channel": "stable",
-      "IsLinux": true,
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "JobName": "ubuntu22.04"
-    },
-    {
-      "TagList": "ubuntu-bionic;ubuntu-18.04",
-      "Channel": "stable",
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "ImageName": "ubuntu18.04",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6553033-07:00",
-      "ImageName": "ubuntu18.04\\test-deps",
-      "OsVersion": "Ubuntu 18.04 (In Validation)",
-      "JobName": "ubuntu18.04\\test_deps"
+      "Channel": "lts",
+      "JobName": "ubuntu18.04"
     },
     {
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
       "OsVersion": "Debian 9",
-      "JobName": "debian9"
-    },
-    {
-      "TagList": "alpine-3.13",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6214059-07:00",
-      "ImageName": "alpine313\\test-deps",
-      "OsVersion": "Alpine 3.13 (In Validation)",
-      "JobName": "alpine313\\test_deps"
-    },
-    {
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84"
-    },
-    {
-      "TagList": "ubuntu-jammy;ubuntu-22.04",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.66069-07:00",
-      "ImageName": "ubuntu22.04\\test-deps",
-      "OsVersion": "Ubuntu 22.04 (In Validation)",
-      "JobName": "ubuntu22.04\\test_deps"
-    },
-    {
-      "TagList": "debian-buster-slim;debian-10",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6284616-07:00",
-      "ImageName": "debian10\\test-deps",
-      "OsVersion": "Debian 10 (In Validation)",
-      "JobName": "debian10\\test_deps"
-    },
-    {
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "Channel": "stable",
-      "IsLinux": true,
+      "EndOfLife": "2022-06-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "ImageName": "debian9",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "JobName": "ubuntu20.04"
+      "Channel": "lts",
+      "JobName": "debian9"
     },
     {
-      "TagList": "alpine-3.14",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "DistributionState": "Validating",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "ImageName": "ubi84",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6244169-07:00",
-      "ImageName": "alpine314\\test-deps",
-      "OsVersion": "Alpine 3.14 (In Validation)",
-      "JobName": "alpine314\\test_deps"
+      "Channel": "lts",
+      "JobName": "ubi84"
     },
     {
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "Channel": "stable",
-      "IsLinux": true,
+      "OsVersion": "Ubuntu 20.04",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "ImageName": "ubuntu20.04",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
-      "OsVersion": "Debian 11",
-      "JobName": "debian11"
+      "Channel": "lts",
+      "JobName": "ubuntu20.04"
     },
     {
-      "TagList": "mariner-1.0",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Ubuntu 22.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "ImageName": "ubuntu22.04",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6379923-07:00",
-      "ImageName": "mariner1\\test-deps",
-      "OsVersion": "Mariner 1.0 (In Validation)",
-      "JobName": "mariner1\\test_deps"
+      "Channel": "lts",
+      "JobName": "ubuntu22.04"
     },
     {
-      "TagList": "debian-bullseye-slim;debian-11",
-      "Channel": "stable",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Debian 10",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "ImageName": "debian10",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.6313088-07:00",
-      "ImageName": "debian11\\test-deps",
-      "OsVersion": "Debian 11 (Testing) (In Validation)",
-      "JobName": "debian11\\test_deps"
+      "Channel": "lts",
+      "JobName": "debian10"
     },
     {
-      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
-      "Channel": "stable",
-      "IsLinux": true,
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "EndOfLife": "2021-04-02T00:00:00",
       "DistributionState": "EndOfLife",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2021-04-02T00:00:00",
+      "IsLinux": true,
+      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
       "ImageName": "ubuntu16.04",
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "ContinueOnError": false,
+      "Channel": "lts",
       "JobName": "ubuntu16.04"
     },
     {
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "Channel": "stable",
-      "IsLinux": false,
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "EndOfLife": "2023-04-02T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "ImageName": "arm32v7",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "JobName": "windowsserver2022"
+      "Channel": "lts",
+      "JobName": "arm32v7"
     },
     {
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
-      "Channel": "stable",
-      "IsLinux": false,
+      "OsVersion": "Nano Server, version 1809",
+      "EndOfLife": "2024-01-09T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2024-01-09T00:00:00",
+      "IsLinux": false,
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "ImageName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
+      "ContinueOnError": false,
+      "Channel": "lts",
       "JobName": "nanoserver1809"
     },
     {
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
-      "Channel": "stable",
-      "IsLinux": false,
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
+      "IsLinux": false,
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "ImageName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
+      "ContinueOnError": false,
+      "Channel": "lts",
       "JobName": "windowsservercore2022"
     },
     {
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "Channel": "stable",
-      "IsLinux": false,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "ContinueOnError": false,
+      "Channel": "lts",
+      "JobName": "windowsserver2022"
+    },
+    {
+      "OsVersion": "Nano Server, LTSC 2022",
       "EndOfLife": "2024-11-30T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "ImageName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
+      "ContinueOnError": false,
+      "Channel": "lts",
       "JobName": "nanoserver2022"
     }
   ],
-  "lts": [
+  "preview": [
     {
-      "TagList": "lts-ubuntu-focal;lts-ubuntu-20.04",
-      "Channel": "lts",
+      "OsVersion": "Alpine 3.13",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": false,
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "ImageName": "alpine313",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7384281-07:00",
-      "ImageName": "ubuntu20.04\\test-deps",
-      "OsVersion": "Ubuntu 20.04 (In Validation)",
-      "JobName": "ubuntu20.04\\test_deps"
+      "Channel": "preview",
+      "JobName": "alpine313"
     },
     {
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Validating",
+      "OsVersion": "Ubuntu 22.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "ImageName": "ubuntu22.04",
       "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84\\test-deps",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84\\test_deps"
+      "Channel": "preview",
+      "JobName": "ubuntu22.04"
     },
     {
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "Channel": "lts",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "DistributionState": "Validating",
+      "UseInCI": false,
       "IsLinux": true,
-      "DistributionState": "Validated",
-      "UseInCI": true,
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "ImageName": "alpine315",
       "ContinueOnError": false,
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "JobName": "alpine314"
+      "Channel": "preview",
+      "JobName": "alpine315"
     },
     {
-      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Validating",
+      "OsVersion": "Debian 10",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "ImageName": "debian10",
       "ContinueOnError": false,
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner1",
-      "OsVersion": "Mariner 1.0 (In Validation)",
-      "JobName": "mariner1"
+      "Channel": "preview",
+      "JobName": "debian10"
     },
     {
-      "TagList": "lts-mariner-2.0",
-      "Channel": "lts",
+      "OsVersion": "Alpine 3.14",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": false,
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "ImageName": "alpine314",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7244152-07:00",
-      "ImageName": "mariner2\\test-deps",
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "JobName": "mariner2\\test_deps"
+      "Channel": "preview",
+      "JobName": "alpine314"
     },
     {
-      "TagList": "lts-debian-stretch-slim;lts-debian-9",
-      "Channel": "lts",
+      "OsVersion": "Ubuntu 20.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": false,
       "IsLinux": true,
-      "DistributionState": "Unknown",
-      "UseInCI": true,
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "ImageName": "ubuntu20.04",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7195271-07:00",
-      "ImageName": "debian9\\test-deps",
-      "OsVersion": "Debian 9 (In Validation)",
-      "JobName": "debian9\\test_deps"
+      "Channel": "preview",
+      "JobName": "ubuntu20.04"
     },
     {
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Validating",
+      "OsVersion": "Debian 11",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "ImageName": "debian11",
       "ContinueOnError": false,
+      "Channel": "preview",
+      "JobName": "debian11"
+    },
+    {
+      "OsVersion": "Mariner 2.0",
       "EndOfLife": "2022-10-14T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "ImageName": "mariner2",
-      "OsVersion": "Mariner 2.0 (In Validation)",
+      "ContinueOnError": false,
+      "Channel": "preview",
       "JobName": "mariner2"
     },
     {
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Validated",
+      "OsVersion": "Universal Base Image 9",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "DistributionState": "ImageCreation",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "ImageName": "ubi9",
       "ContinueOnError": false,
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
-      "OsVersion": "Debian 10",
-      "JobName": "debian10"
+      "Channel": "preview",
+      "JobName": "ubi9"
     },
     {
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Validated",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "DistributionState": "Validating",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "JobName": "alpine313"
+      "IsLinux": true,
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "ImageName": "ubi84",
+      "ContinueOnError": false,
+      "Channel": "preview",
+      "JobName": "ubi84"
     },
     {
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Nano Server, version 1809",
+      "EndOfLife": "2023-12-15T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "ImageName": "nanoserver1809",
       "ContinueOnError": false,
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "JobName": "ubuntu18.04"
+      "Channel": "preview",
+      "JobName": "nanoserver1809"
     },
     {
-      "TagList": "lts-ubuntu-xenial;lts-ubuntu-16.04",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "ImageName": "windowsservercore2022",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7333554-07:00",
-      "ImageName": "ubuntu16.04\\test-deps",
-      "OsVersion": "Ubuntu 16.04 (In Validation)",
-      "JobName": "ubuntu16.04\\test_deps"
+      "Channel": "preview",
+      "JobName": "windowsservercore2022"
     },
     {
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "EndOfLife": "2023-12-15T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "ContinueOnError": false,
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "JobName": "arm32v7"
+      "Channel": "preview",
+      "JobName": "windowsserver2022"
     },
     {
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Nano Server, LTSC 2022",
+      "EndOfLife": "2023-12-15T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "ImageName": "nanoserver2022",
       "ContinueOnError": false,
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "JobName": "ubuntu22.04"
-    },
+      "Channel": "preview",
+      "JobName": "nanoserver2022"
+    }
+  ],
+  "stable": [
     {
-      "TagList": "lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Debian 11",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "ImageName": "debian11",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.735916-07:00",
-      "ImageName": "ubuntu18.04\\test-deps",
-      "OsVersion": "Ubuntu 18.04 (In Validation)",
-      "JobName": "ubuntu18.04\\test_deps"
+      "Channel": "stable",
+      "JobName": "debian11"
     },
     {
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Alpine 3.14",
+      "EndOfLife": "2023-05-01T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "ImageName": "alpine314",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "OsVersion": "Debian 9",
-      "JobName": "debian9"
+      "Channel": "stable",
+      "JobName": "alpine314"
     },
     {
-      "TagList": "lts-alpine-3.13",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Alpine 3.13",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "ImageName": "alpine313",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.70807-07:00",
-      "ImageName": "alpine313\\test-deps",
-      "OsVersion": "Alpine 3.13 (In Validation)",
-      "JobName": "alpine313\\test_deps"
+      "Channel": "stable",
+      "JobName": "alpine313"
     },
     {
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Mariner 1.0 (In Validation)",
+      "EndOfLife": "2022-10-14T00:00:00",
       "DistributionState": "Validating",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "mariner-1.0;7.2-mariner-1.0",
+      "ImageName": "mariner1",
       "ContinueOnError": false,
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "JobName": "ubi84"
+      "Channel": "stable",
+      "JobName": "mariner1"
     },
     {
-      "TagList": "lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "DistributionState": "Validating",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "ImageName": "mariner2",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7409169-07:00",
-      "ImageName": "ubuntu22.04\\test-deps",
-      "OsVersion": "Ubuntu 22.04 (In Validation)",
-      "JobName": "ubuntu22.04\\test_deps"
+      "Channel": "stable",
+      "JobName": "mariner2"
     },
     {
-      "TagList": "lts-debian-buster-slim;lts-debian-10",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Ubuntu 18.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "ImageName": "ubuntu18.04",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7145106-07:00",
-      "ImageName": "debian10\\test-deps",
-      "OsVersion": "Debian 10 (In Validation)",
-      "JobName": "debian10\\test_deps"
+      "Channel": "stable",
+      "JobName": "ubuntu18.04"
     },
     {
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Debian 9",
+      "EndOfLife": "2022-06-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "ImageName": "debian9",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "JobName": "ubuntu20.04"
+      "Channel": "stable",
+      "JobName": "debian9"
     },
     {
-      "TagList": "lts-alpine-3.14",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "DistributionState": "Validating",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "ImageName": "ubi84",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.710577-07:00",
-      "ImageName": "alpine314\\test-deps",
-      "OsVersion": "Alpine 3.14 (In Validation)",
-      "JobName": "alpine314\\test_deps"
+      "Channel": "stable",
+      "JobName": "ubi84"
     },
     {
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Ubuntu 20.04",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "ImageName": "ubuntu20.04",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
-      "OsVersion": "Debian 11",
-      "JobName": "debian11"
+      "Channel": "stable",
+      "JobName": "ubuntu20.04"
     },
     {
-      "TagList": "lts-mariner-1.0",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Ubuntu 22.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "ImageName": "ubuntu22.04",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7219804-07:00",
-      "ImageName": "mariner1\\test-deps",
-      "OsVersion": "Mariner 1.0 (In Validation)",
-      "JobName": "mariner1\\test_deps"
+      "Channel": "stable",
+      "JobName": "ubuntu22.04"
     },
     {
-      "TagList": "lts-debian-bullseye-slim;lts-debian-11",
-      "Channel": "lts",
-      "IsLinux": true,
-      "DistributionState": "Unknown",
+      "OsVersion": "Debian 10",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "ImageName": "debian10",
       "ContinueOnError": false,
-      "EndOfLife": "2022-06-07T14:24:08.7170415-07:00",
-      "ImageName": "debian11\\test-deps",
-      "OsVersion": "Debian 11 (Testing) (In Validation)",
-      "JobName": "debian11\\test_deps"
+      "Channel": "stable",
+      "JobName": "debian10"
     },
     {
-      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
-      "Channel": "lts",
-      "IsLinux": true,
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "EndOfLife": "2021-04-02T00:00:00",
       "DistributionState": "EndOfLife",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2021-04-02T00:00:00",
+      "IsLinux": true,
+      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
       "ImageName": "ubuntu16.04",
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "ContinueOnError": false,
+      "Channel": "stable",
       "JobName": "ubuntu16.04"
     },
     {
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
-      "Channel": "lts",
-      "IsLinux": false,
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "EndOfLife": "2023-04-02T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": true,
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
+      "ImageName": "arm32v7",
       "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "JobName": "windowsserver2022"
+      "Channel": "stable",
+      "JobName": "arm32v7"
     },
     {
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
-      "Channel": "lts",
-      "IsLinux": false,
+      "OsVersion": "Nano Server, version 1809",
+      "EndOfLife": "2024-01-09T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2024-01-09T00:00:00",
+      "IsLinux": false,
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "ImageName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
+      "ContinueOnError": false,
+      "Channel": "stable",
       "JobName": "nanoserver1809"
     },
     {
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
-      "Channel": "lts",
-      "IsLinux": false,
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
-      "ContinueOnError": false,
-      "EndOfLife": "2024-11-30T00:00:00",
+      "IsLinux": false,
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "ImageName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
+      "ContinueOnError": false,
+      "Channel": "stable",
       "JobName": "windowsservercore2022"
     },
     {
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "Channel": "lts",
-      "IsLinux": false,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "EndOfLife": "2024-11-30T00:00:00",
       "DistributionState": "Validated",
       "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "ContinueOnError": false,
+      "Channel": "stable",
+      "JobName": "windowsserver2022"
+    },
+    {
+      "OsVersion": "Nano Server, LTSC 2022",
       "EndOfLife": "2024-11-30T00:00:00",
+      "DistributionState": "Validated",
+      "UseInCI": true,
+      "IsLinux": false,
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "ImageName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
+      "ContinueOnError": false,
+      "Channel": "stable",
       "JobName": "nanoserver2022"
     }
   ]

From fb1cdae41f83652e0e357595e084c79d5d21409c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 May 2022 16:40:50 -0700
Subject: [PATCH 212/354] Make matrix JSON consistent (#662)

---
 build.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 676337f2c..b0d44c2fa 100755
--- a/build.ps1
+++ b/build.ps1
@@ -630,11 +630,11 @@ End {
             }
         }
 
-        foreach ($channelName in $matrix.Keys) {
+        foreach ($channelName in $matrix.Keys | Sort-Object) {
             $fullMatrix[$channelName] = @()
             foreach ($osName in $matrix.$channelName.Keys | Sort-Object) {
                 $osMatrix = $matrix.$channelName.$osName
-                $fullMatrix[$channelName] += $osMatrix.Values
+                $fullMatrix[$channelName] += $osMatrix.Values | Sort-Object -Property ImageName
                 $matrixJson = $osMatrix | ConvertTo-Json -Compress
                 $variableName = "matrix_${channelName}_${osName}"
                 if (!$FullJson) {

From 1cddc0f93ee02ac2042bccac2c71238f8ddee45a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 16:42:06 -0700
Subject: [PATCH 213/354] Update the matrix json (#661)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 618 ++++++++++++++++++++++-----------------------
 1 file changed, 309 insertions(+), 309 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 2ee166d29..223633404 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,584 +1,584 @@
 {
   "lts": [
     {
-      "OsVersion": "Debian 11",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "alpine313",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "ImageName": "debian11",
-      "ContinueOnError": false,
+      "ImageName": "alpine313",
       "Channel": "lts",
-      "JobName": "debian11"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.13"
     },
     {
-      "OsVersion": "Alpine 3.14",
+      "JobName": "alpine314",
       "EndOfLife": "2023-05-01T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "ImageName": "alpine314",
-      "ContinueOnError": false,
       "Channel": "lts",
-      "JobName": "alpine314"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.14"
     },
     {
-      "OsVersion": "Alpine 3.13",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "arm32v7",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "ImageName": "alpine313",
-      "ContinueOnError": false,
+      "ImageName": "arm32v7",
       "Channel": "lts",
-      "JobName": "alpine313"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7"
     },
     {
-      "OsVersion": "Mariner 1.0 (In Validation)",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "debian10",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
-      "ImageName": "mariner1",
-      "ContinueOnError": false,
+      "ImageName": "debian10",
       "Channel": "lts",
-      "JobName": "mariner1"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 10"
     },
     {
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "debian11",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "ImageName": "mariner2",
-      "ContinueOnError": false,
+      "ImageName": "debian11",
       "Channel": "lts",
-      "JobName": "mariner2"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 11"
     },
     {
-      "OsVersion": "Ubuntu 18.04",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "debian9",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "ImageName": "ubuntu18.04",
-      "ContinueOnError": false,
+      "ImageName": "debian9",
       "Channel": "lts",
-      "JobName": "ubuntu18.04"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 9"
     },
     {
-      "OsVersion": "Debian 9",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "mariner1",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "ImageName": "debian9",
-      "ContinueOnError": false,
+      "ImageName": "mariner1",
       "Channel": "lts",
-      "JobName": "debian9"
+      "DistributionState": "Validating",
+      "OsVersion": "Mariner 1.0 (In Validation)"
     },
     {
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "mariner2",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "ImageName": "ubi84",
-      "ContinueOnError": false,
+      "ImageName": "mariner2",
       "Channel": "lts",
-      "JobName": "ubi84"
+      "DistributionState": "Validating",
+      "OsVersion": "Mariner 2.0 (In Validation)"
     },
     {
-      "OsVersion": "Ubuntu 20.04",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubi84",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "ImageName": "ubuntu20.04",
-      "ContinueOnError": false,
+      "ImageName": "ubi84",
       "Channel": "lts",
-      "JobName": "ubuntu20.04"
+      "DistributionState": "Validating",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)"
     },
     {
-      "OsVersion": "Ubuntu 22.04",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu16.04",
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "ImageName": "ubuntu22.04",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu16.04",
       "Channel": "lts",
-      "JobName": "ubuntu22.04"
+      "DistributionState": "EndOfLife",
+      "OsVersion": "Ubuntu 16.04 (End of Life)"
     },
     {
-      "OsVersion": "Debian 10",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu18.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "ImageName": "debian10",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu18.04",
       "Channel": "lts",
-      "JobName": "debian10"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 18.04"
     },
     {
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
-      "EndOfLife": "2021-04-02T00:00:00",
-      "DistributionState": "EndOfLife",
+      "JobName": "ubuntu20.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
-      "ImageName": "ubuntu16.04",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu20.04",
       "Channel": "lts",
-      "JobName": "ubuntu16.04"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 20.04"
     },
     {
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu22.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
-      "ImageName": "arm32v7",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu22.04",
       "Channel": "lts",
-      "JobName": "arm32v7"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 22.04"
     },
     {
-      "OsVersion": "Nano Server, version 1809",
+      "JobName": "nanoserver1809",
       "EndOfLife": "2024-01-09T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "ImageName": "nanoserver1809",
-      "ContinueOnError": false,
       "Channel": "lts",
-      "JobName": "nanoserver1809"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, version 1809"
     },
     {
-      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "nanoserver2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
-      "ImageName": "windowsservercore2022",
-      "ContinueOnError": false,
+      "ImageName": "nanoserver2022",
       "Channel": "lts",
-      "JobName": "windowsservercore2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, LTSC 2022"
     },
     {
-      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "ImageName": "windowsserver2022",
-      "ContinueOnError": false,
       "Channel": "lts",
-      "JobName": "windowsserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server, LTSC 2022"
     },
     {
-      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "windowsservercore2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "ImageName": "nanoserver2022",
-      "ContinueOnError": false,
+      "ImageName": "windowsservercore2022",
       "Channel": "lts",
-      "JobName": "nanoserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server Core, LTSC 2022"
     }
   ],
   "preview": [
     {
-      "OsVersion": "Alpine 3.13",
+      "JobName": "alpine313",
       "EndOfLife": "2022-11-01T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
       "UseInCI": false,
       "IsLinux": true,
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
       "ImageName": "alpine313",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "alpine313"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.13"
     },
     {
-      "OsVersion": "Ubuntu 22.04",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
-      "UseInCI": true,
-      "IsLinux": true,
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "ImageName": "ubuntu22.04",
+      "JobName": "alpine314",
+      "EndOfLife": "2023-05-01T00:00:00",
       "ContinueOnError": false,
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false,
+      "IsLinux": true,
+      "ImageName": "alpine314",
       "Channel": "preview",
-      "JobName": "ubuntu22.04"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.14"
     },
     {
-      "OsVersion": "Alpine 3.15 (In Validation)",
+      "JobName": "alpine315",
       "EndOfLife": "2023-11-01T00:00:00",
-      "DistributionState": "Validating",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
       "UseInCI": false,
       "IsLinux": true,
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
       "ImageName": "alpine315",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "alpine315"
+      "DistributionState": "Validating",
+      "OsVersion": "Alpine 3.15 (In Validation)"
     },
     {
-      "OsVersion": "Debian 10",
+      "JobName": "debian10",
       "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "ImageName": "debian10",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "debian10"
-    },
-    {
-      "OsVersion": "Alpine 3.14",
-      "EndOfLife": "2023-05-01T00:00:00",
       "DistributionState": "Validated",
-      "UseInCI": false,
-      "IsLinux": true,
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "ImageName": "alpine314",
-      "ContinueOnError": false,
-      "Channel": "preview",
-      "JobName": "alpine314"
+      "OsVersion": "Debian 10"
     },
     {
-      "OsVersion": "Ubuntu 20.04",
+      "JobName": "debian11",
       "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
-      "UseInCI": false,
-      "IsLinux": true,
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "ImageName": "ubuntu20.04",
       "ContinueOnError": false,
-      "Channel": "preview",
-      "JobName": "ubuntu20.04"
-    },
-    {
-      "OsVersion": "Debian 11",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "ImageName": "debian11",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "debian11"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 11"
     },
     {
-      "OsVersion": "Mariner 2.0",
+      "JobName": "mariner2",
       "EndOfLife": "2022-10-14T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "ImageName": "mariner2",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "mariner2"
+      "DistributionState": "Validated",
+      "OsVersion": "Mariner 2.0"
     },
     {
-      "OsVersion": "Universal Base Image 9",
+      "JobName": "ubi84",
       "EndOfLife": "2023-05-30T00:00:00",
-      "DistributionState": "ImageCreation",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
-      "ImageName": "ubi9",
-      "ContinueOnError": false,
+      "ImageName": "ubi84",
       "Channel": "preview",
-      "JobName": "ubi9"
+      "DistributionState": "Validating",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)"
     },
     {
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "JobName": "ubi9",
       "EndOfLife": "2023-05-30T00:00:00",
-      "DistributionState": "Validating",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
-      "ImageName": "ubi84",
+      "ImageName": "ubi9",
+      "Channel": "preview",
+      "DistributionState": "ImageCreation",
+      "OsVersion": "Universal Base Image 9"
+    },
+    {
+      "JobName": "ubuntu20.04",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ContinueOnError": false,
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false,
+      "IsLinux": true,
+      "ImageName": "ubuntu20.04",
       "Channel": "preview",
-      "JobName": "ubi84"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 20.04"
     },
     {
-      "OsVersion": "Nano Server, version 1809",
+      "JobName": "ubuntu22.04",
       "EndOfLife": "2023-12-15T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "UseInCI": true,
+      "IsLinux": true,
+      "ImageName": "ubuntu22.04",
+      "Channel": "preview",
       "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 22.04"
+    },
+    {
+      "JobName": "nanoserver1809",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "ImageName": "nanoserver1809",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "nanoserver1809"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, version 1809"
     },
     {
-      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "nanoserver2022",
       "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "ImageName": "windowsservercore2022",
-      "ContinueOnError": false,
+      "ImageName": "nanoserver2022",
       "Channel": "preview",
-      "JobName": "windowsservercore2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, LTSC 2022"
     },
     {
-      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022",
       "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "ImageName": "windowsserver2022",
-      "ContinueOnError": false,
       "Channel": "preview",
-      "JobName": "windowsserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server, LTSC 2022"
     },
     {
-      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "windowsservercore2022",
       "EndOfLife": "2023-12-15T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
-      "ImageName": "nanoserver2022",
-      "ContinueOnError": false,
+      "ImageName": "windowsservercore2022",
       "Channel": "preview",
-      "JobName": "nanoserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server Core, LTSC 2022"
     }
   ],
   "stable": [
     {
-      "OsVersion": "Debian 11",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "alpine313",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "ImageName": "debian11",
-      "ContinueOnError": false,
+      "ImageName": "alpine313",
       "Channel": "stable",
-      "JobName": "debian11"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.13"
     },
     {
-      "OsVersion": "Alpine 3.14",
+      "JobName": "alpine314",
       "EndOfLife": "2023-05-01T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "ImageName": "alpine314",
-      "ContinueOnError": false,
       "Channel": "stable",
-      "JobName": "alpine314"
+      "DistributionState": "Validated",
+      "OsVersion": "Alpine 3.14"
     },
     {
-      "OsVersion": "Alpine 3.13",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "arm32v7",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "ImageName": "alpine313",
-      "ContinueOnError": false,
+      "ImageName": "arm32v7",
       "Channel": "stable",
-      "JobName": "alpine313"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7"
     },
     {
-      "OsVersion": "Mariner 1.0 (In Validation)",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "debian10",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "mariner-1.0;7.2-mariner-1.0",
-      "ImageName": "mariner1",
-      "ContinueOnError": false,
+      "ImageName": "debian10",
       "Channel": "stable",
-      "JobName": "mariner1"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 10"
     },
     {
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "debian11",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
-      "ImageName": "mariner2",
-      "ContinueOnError": false,
+      "ImageName": "debian11",
       "Channel": "stable",
-      "JobName": "mariner2"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 11"
     },
     {
-      "OsVersion": "Ubuntu 18.04",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "debian9",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
-      "ImageName": "ubuntu18.04",
-      "ContinueOnError": false,
+      "ImageName": "debian9",
       "Channel": "stable",
-      "JobName": "ubuntu18.04"
+      "DistributionState": "Validated",
+      "OsVersion": "Debian 9"
     },
     {
-      "OsVersion": "Debian 9",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "mariner1",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "mariner-1.0;7.2-mariner-1.0",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "ImageName": "debian9",
-      "ContinueOnError": false,
+      "ImageName": "mariner1",
       "Channel": "stable",
-      "JobName": "debian9"
+      "DistributionState": "Validating",
+      "OsVersion": "Mariner 1.0 (In Validation)"
     },
     {
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "DistributionState": "Validating",
+      "JobName": "mariner2",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "ImageName": "ubi84",
-      "ContinueOnError": false,
+      "ImageName": "mariner2",
       "Channel": "stable",
-      "JobName": "ubi84"
+      "DistributionState": "Validating",
+      "OsVersion": "Mariner 2.0 (In Validation)"
     },
     {
-      "OsVersion": "Ubuntu 20.04",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubi84",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "ImageName": "ubuntu20.04",
-      "ContinueOnError": false,
+      "ImageName": "ubi84",
       "Channel": "stable",
-      "JobName": "ubuntu20.04"
+      "DistributionState": "Validating",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)"
     },
     {
-      "OsVersion": "Ubuntu 22.04",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu16.04",
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "ImageName": "ubuntu22.04",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu16.04",
       "Channel": "stable",
-      "JobName": "ubuntu22.04"
+      "DistributionState": "EndOfLife",
+      "OsVersion": "Ubuntu 16.04 (End of Life)"
     },
     {
-      "OsVersion": "Debian 10",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu18.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "ImageName": "debian10",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu18.04",
       "Channel": "stable",
-      "JobName": "debian10"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 18.04"
     },
     {
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
-      "EndOfLife": "2021-04-02T00:00:00",
-      "DistributionState": "EndOfLife",
+      "JobName": "ubuntu20.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
-      "ImageName": "ubuntu16.04",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu20.04",
       "Channel": "stable",
-      "JobName": "ubuntu16.04"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 20.04"
     },
     {
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "DistributionState": "Validated",
+      "JobName": "ubuntu22.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ContinueOnError": false,
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true,
       "IsLinux": true,
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
-      "ImageName": "arm32v7",
-      "ContinueOnError": false,
+      "ImageName": "ubuntu22.04",
       "Channel": "stable",
-      "JobName": "arm32v7"
+      "DistributionState": "Validated",
+      "OsVersion": "Ubuntu 22.04"
     },
     {
-      "OsVersion": "Nano Server, version 1809",
+      "JobName": "nanoserver1809",
       "EndOfLife": "2024-01-09T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "ImageName": "nanoserver1809",
-      "ContinueOnError": false,
       "Channel": "stable",
-      "JobName": "nanoserver1809"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, version 1809"
     },
     {
-      "OsVersion": "Windows Server Core, LTSC 2022",
+      "JobName": "nanoserver2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
-      "ImageName": "windowsservercore2022",
-      "ContinueOnError": false,
+      "ImageName": "nanoserver2022",
       "Channel": "stable",
-      "JobName": "windowsservercore2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Nano Server, LTSC 2022"
     },
     {
-      "OsVersion": "Windows Server, LTSC 2022",
+      "JobName": "windowsserver2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "ImageName": "windowsserver2022",
-      "ContinueOnError": false,
       "Channel": "stable",
-      "JobName": "windowsserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server, LTSC 2022"
     },
     {
-      "OsVersion": "Nano Server, LTSC 2022",
+      "JobName": "windowsservercore2022",
       "EndOfLife": "2024-11-30T00:00:00",
-      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true,
       "IsLinux": false,
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "ImageName": "nanoserver2022",
-      "ContinueOnError": false,
+      "ImageName": "windowsservercore2022",
       "Channel": "stable",
-      "JobName": "nanoserver2022"
+      "DistributionState": "Validated",
+      "OsVersion": "Windows Server Core, LTSC 2022"
     }
   ]
 }

From 05479def959bc3c08d18a57f5f972ff5843acfc5 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 May 2022 17:33:12 -0700
Subject: [PATCH 214/354] Make matrix JSON consistent (#664)

* Make matrix JSON consistent

* fix path
---
 .github/workflows/update.yml |  2 +-
 tools/updateJson.ps1         | 58 ++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 tools/updateJson.ps1

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 7e8c1af89..480d2fec0 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Auto-update JSON
         run: |
-          .\build.ps1 -GenerateMatrixJson -FullJson -Channel preview, stable > .\assets\matrix.json
+          ./tools/updateJson.ps1
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
diff --git a/tools/updateJson.ps1 b/tools/updateJson.ps1
new file mode 100644
index 000000000..1fb64dd5c
--- /dev/null
+++ b/tools/updateJson.ps1
@@ -0,0 +1,58 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+$diffFound = $false
+$jsonPath = "$PSScriptRoot\..\assets\matrix.json"
+$json = &"$PSScriptRoot\..\build.ps1" -GenerateMatrixJson -FullJson
+$newMatrix = $json | ConvertFrom-Json
+$oldMatrix = Get-Content -Raw $jsonPath | ConvertFrom-Json
+$newChannels = $newMatrix | Get-Member -Type NoteProperty  | Select-Object -ExpandProperty Name | Sort-Object
+$oldChannels = $oldMatrix | Get-Member -Type NoteProperty  | Select-Object -ExpandProperty Name | Sort-Object
+if (Compare-Object $newChannels -DifferenceObject $oldChannels) {
+    $diffFound = $true
+}
+
+if (!$diffFound) {
+    foreach ($channel in $newChannels) {
+        $newImages = $newMatrix.$channel
+        $oldImages = $oldMatrix.$channel
+        if ($newImages.Count -ne $oldImages.Count) {
+            Write-Verbose -message "diff found in ${channel} image count. $($newImages.Count) : $($oldImages.Count)" -Verbose
+            $diffFound = $true
+            break
+        }
+        $newImageNames = $newImages | Select-Object -ExpandProperty JobName | Sort-Object
+        foreach ($imageName in $newImageNames) {
+            Write-Verbose -Message "Checking ${channel}/$($imageName)" -Verbose
+            $newImage = $newImages | Where-Object { $_.JobName -eq $imageName }
+            $oldImage = $oldImages | Where-Object { $_.JobName -eq $imageName }
+            if (!$newImage) {
+                throw "new image not found: $imageName"
+            }
+            $properties = $newImage | get-member -Type NoteProperty | Select-Object -ExpandProperty Name
+            foreach($property in $properties) {
+                if($newImage.$property -ne $oldImage.$property) {
+                    Write-Verbose -Message "diff found in ${channel}/$($imageName)/$($property)" -Verbose
+                    $diffFound = $true
+                    break
+                }
+            }
+            if ($diffFound) {
+                Write-Verbose -Message "breaking in ${channel}/$($imageName)" -Verbose
+                break
+            }
+        }
+        if ($diffFound) {
+            Write-Verbose -Message "breaking in ${channel}" -Verbose
+            break
+        }
+    }
+}
+
+if ($diffFound) {
+    Write-Verbose -message "diff found" -Verbose
+    $json > $jsonPath
+}
+else {
+    Write-Verbose -Message "no diff found" -Verbose
+}

From 02092aa46c674232567244ffeb818fac53b07cce Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 1 Jun 2022 19:45:25 -0400
Subject: [PATCH 215/354] Ubuntu22 should use .deb installer package for
 powershell (#656)

* ubuntu22.04 stable should use .deb package

* use 7.2.4 for ubuntu stable deb package

* update ubuntu22 preview to use .deb package for powershell instead of tar.gz

* Use mounts to optimize the image build

* Simplify docker file

* Fix channel tage

* Update meta.json

* ubuntu22 preview image should also use mount

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/7-2/ubuntu22.04/docker/Dockerfile | 78 +++++++++-------------
 release/7-2/ubuntu22.04/meta.json         |  4 +-
 release/7-3/ubuntu22.04/docker/Dockerfile | 81 +++++++++++------------
 release/7-3/ubuntu22.04/meta.json         |  4 +-
 4 files changed, 75 insertions(+), 92 deletions(-)

diff --git a/release/7-2/ubuntu22.04/docker/Dockerfile b/release/7-2/ubuntu22.04/docker/Dockerfile
index 2b26d98f2..3b62a4cfe 100644
--- a/release/7-2/ubuntu22.04/docker/Dockerfile
+++ b/release/7-2/ubuntu22.04/docker/Dockerfile
@@ -1,44 +1,41 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+# Download the deb file in this image
 FROM ubuntu:22.04 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.2.2
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_VERSION=7.2.4
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
 
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # required to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
 
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ubuntu:22.04 AS powershell
+# Install the deb file in this image and make powershell available
+FROM ubuntu:22.04 AS final-image
 
-ARG PS_VERSION=7.2.2
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.2.4
+ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
 
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
@@ -46,7 +43,11 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-22.04
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
     && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
@@ -55,26 +56,11 @@ RUN apt-get update \
     # required for SSL
         ca-certificates \
         gss-ntlmssp \
-        libicu70 \
-        libssl3 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
         liblttng-ust1 \
-        libstdc++6 \
-        zlib1g \
     # PowerShell remoting over SSH dependencies
         openssh-client \
-    # Download the Linux package and save it
     && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale
-
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && locale-gen $LANG && update-locale \
     # intialize powershell module cache
     # and disable telemetry
     && export POWERSHELL_TELEMETRY_OPTOUT=1 \
diff --git a/release/7-2/ubuntu22.04/meta.json b/release/7-2/ubuntu22.04/meta.json
index f0b15f333..6b3dbc7e5 100644
--- a/release/7-2/ubuntu22.04/meta.json
+++ b/release/7-2/ubuntu22.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 22.04",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
@@ -16,7 +16,7 @@
         "latest"
     ],
     "TestProperties": {
-        "size": 390
+        "size": 343
     },
     "SubImage": "test-deps",
     "EndOfLife": "2032-04-01",
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-3/ubuntu22.04/docker/Dockerfile
index e6d63a659..dd05aebdf 100644
--- a/release/7-3/ubuntu22.04/docker/Dockerfile
+++ b/release/7-3/ubuntu22.04/docker/Dockerfile
@@ -5,48 +5,51 @@
 FROM ubuntu:22.04 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_VERSION=7.3.0-preview.4
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
 
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ubuntu:22.04 AS powershell
+# Install the deb file in this image and make powershell available
+FROM ubuntu:22.04 AS final-image
 
-ARG PS_VERSION=7.3.0-preview.1
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.4
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-22.04
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
     && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
@@ -65,21 +68,15 @@ RUN apt-get update \
         zlib1g \
     # PowerShell remoting over SSH dependencies
         openssh-client \
-    # Download the Linux package and save it
     && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale
-
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # intialize powershell module cache
-    # and disable telemetry
+    && locale-gen $LANG && update-locale \
     && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
     && pwsh \
         -NoLogo \
         -NoProfile \
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
index ff2a4c3c3..617666430 100644
--- a/release/7-3/ubuntu22.04/meta.json
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Ubuntu 22.04",
     "SkipGssNtlmSspTests": false,
     "ShortDistroName": "ubuntu",
@@ -13,7 +13,7 @@
         "preview"
     ],
     "TestProperties": {
-        "size": 334
+        "size": 276
     },
     "SubImage": "test-deps",
     "EndOfLife": "2023-12-15",

From 9720df87ee0d570af4c40c2ce2d7b8e2b693d370 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 1 Jun 2022 16:47:54 -0700
Subject: [PATCH 216/354] Remove mariner1 and add comment about UBI9 (#665)

* Delete release/7-2/mariner1 directory

* Update Dockerfile
---
 release/7-2/mariner1/docker/Dockerfile        | 87 -------------------
 release/7-2/mariner1/meta.json                | 19 ----
 .../7-2/mariner1/test-deps/docker/Dockerfile  | 33 -------
 release/7-2/mariner1/test-deps/meta.json      | 17 ----
 release/7-3/ubi9/docker/Dockerfile            |  1 +
 5 files changed, 1 insertion(+), 156 deletions(-)
 delete mode 100644 release/7-2/mariner1/docker/Dockerfile
 delete mode 100644 release/7-2/mariner1/meta.json
 delete mode 100644 release/7-2/mariner1/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/mariner1/test-deps/meta.json

diff --git a/release/7-2/mariner1/docker/Dockerfile b/release/7-2/mariner1/docker/Dockerfile
deleted file mode 100644
index 1fb7a02fd..000000000
--- a/release/7-2/mariner1/docker/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-RUN echo ${PS_PACKAGE_URL}
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM cblmariner.azurecr.io/base/core:1.0 AS powershell
-
-ARG PS_VERSION=7.3.0-preview.1
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
-
-# Install dependencies and clean up
-RUN tdnf update -y \
-    # install dependencies
-    && tdnf install -y \
-    # required for localization
-    icu \
-    # required for help in PowerShell
-    less \
-    # required for SSH
-    openssh-clients \
-    ca-certificates \
-    # upgrade packages
-    && tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all \
-    # remove cache folders and files
-    && rm -rf /var/cache/yum
-
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
diff --git a/release/7-2/mariner1/meta.json b/release/7-2/mariner1/meta.json
deleted file mode 100644
index dbbf6cd07..000000000
--- a/release/7-2/mariner1/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 1.0",
-    "shortTags": [
-        {"Tag": "1.0"}
-    ],
-    "tagTemplates": [
-        "mariner-#shorttag#",
-        "#psversion#-mariner-#shorttag#"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 610
-    },
-    "EndOfLife": "2022-10-14",
-    "DistributionState": "Validating"
-}
diff --git a/release/7-2/mariner1/test-deps/docker/Dockerfile b/release/7-2/mariner1/test-deps/docker/Dockerfile
deleted file mode 100644
index 481365ea8..000000000
--- a/release/7-2/mariner1/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    # install dependencies
-    && tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    # upgrade packages
-    && tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-1.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/mariner1/test-deps/meta.json b/release/7-2/mariner1/test-deps/meta.json
deleted file mode 100644
index fe2b357e5..000000000
--- a/release/7-2/mariner1/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 1.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 610
-    }
-}
diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
index 8def0791c..30d25ce10 100644
--- a/release/7-3/ubi9/docker/Dockerfile
+++ b/release/7-3/ubi9/docker/Dockerfile
@@ -39,6 +39,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
     # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
+    # Fixed in https://github.com/dotnet/runtime/pull/69668
     OPENSSL_ENABLE_SHA1_SIGNATURES=1
 
 RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \

From ba2b1c06a4d4b74a2760aa4976240a1e4cf85bd2 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 2 Jun 2022 11:31:33 -0700
Subject: [PATCH 217/354] Delete Ubuntu 16 because it is EOL (#667)

---
 release/7-2/ubuntu16.04/docker/Dockerfile     | 60 -------------------
 release/7-2/ubuntu16.04/meta.json             | 21 -------
 .../ubuntu16.04/test-deps/docker/Dockerfile   | 23 -------
 release/7-2/ubuntu16.04/test-deps/meta.json   | 16 -----
 4 files changed, 120 deletions(-)
 delete mode 100644 release/7-2/ubuntu16.04/docker/Dockerfile
 delete mode 100644 release/7-2/ubuntu16.04/meta.json
 delete mode 100644 release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/ubuntu16.04/test-deps/meta.json

diff --git a/release/7-2/ubuntu16.04/docker/Dockerfile b/release/7-2/ubuntu16.04/docker/Dockerfile
deleted file mode 100644
index da904032e..000000000
--- a/release/7-2/ubuntu16.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-
-FROM ubuntu:16.04 AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-16.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu16.04/meta.json b/release/7-2/ubuntu16.04/meta.json
deleted file mode 100644
index 3b2e2d619..000000000
--- a/release/7-2/ubuntu16.04/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#",
-        "ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "xenial"},
-        {"Tag": "16.04"}
-    ],
-    "SkipGssNtlmSspTests": false,
-    "TestProperties": {
-        "size": 395
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2021-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
deleted file mode 100644
index 38baf4444..000000000
--- a/release/7-2/ubuntu16.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-16.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-16.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu16.04/test-deps/meta.json b/release/7-2/ubuntu16.04/test-deps/meta.json
deleted file mode 100644
index b28a47542..000000000
--- a/release/7-2/ubuntu16.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 16.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 436
-    }
-}

From 8581a7a6c3e883e1d0308fdf60dd95cdffdd7de8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 12:13:34 -0700
Subject: [PATCH 218/354] Update the matrix json (#666)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 650 ++++++++++++++++++++++-----------------------
 1 file changed, 313 insertions(+), 337 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 223633404..79e5f4062 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -2,583 +2,559 @@
   "lts": [
     {
       "JobName": "alpine313",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "alpine313",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.13"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.13",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313"
     },
     {
       "JobName": "alpine314",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "alpine314",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.14"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.14",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314"
     },
     {
       "JobName": "arm32v7",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "arm32v7",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7"
     },
     {
       "JobName": "debian10",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "debian10",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 10"
+      "ContinueOnError": false,
+      "OsVersion": "Debian 10",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10"
     },
     {
       "JobName": "debian11",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "debian11",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 11"
+      "ContinueOnError": false,
+      "OsVersion": "Debian 11",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11"
     },
     {
       "JobName": "debian9",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "debian9",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 9"
-    },
-    {
-      "JobName": "mariner1",
-      "EndOfLife": "2022-10-14T00:00:00",
       "ContinueOnError": false,
-      "TagList": "lts-mariner-1.0;lts-7.2-mariner-1.0",
+      "OsVersion": "Debian 9",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "mariner1",
       "Channel": "lts",
-      "DistributionState": "Validating",
-      "OsVersion": "Mariner 1.0 (In Validation)"
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9"
     },
     {
       "JobName": "mariner2",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "mariner2",
-      "Channel": "lts",
       "DistributionState": "Validating",
-      "OsVersion": "Mariner 2.0 (In Validation)"
+      "ContinueOnError": false,
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2"
     },
     {
       "JobName": "ubi84",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "ubi84",
-      "Channel": "lts",
       "DistributionState": "Validating",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)"
+      "ContinueOnError": false,
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84"
     },
     {
       "JobName": "ubuntu16.04",
-      "EndOfLife": "2021-04-02T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "ubuntu16.04",
-      "Channel": "lts",
       "DistributionState": "EndOfLife",
-      "OsVersion": "Ubuntu 16.04 (End of Life)"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ImageName": "ubuntu16.04"
     },
     {
       "JobName": "ubuntu18.04",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "ubuntu18.04",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 18.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 18.04",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04"
     },
     {
       "JobName": "ubuntu20.04",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "ubuntu20.04",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 20.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 20.04",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04"
     },
     {
       "JobName": "ubuntu22.04",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "UseInCI": true,
       "IsLinux": true,
-      "ImageName": "ubuntu22.04",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 22.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 22.04",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04"
     },
     {
       "JobName": "nanoserver1809",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
-      "UseInCI": true,
       "IsLinux": false,
-      "ImageName": "nanoserver1809",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, version 1809"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, version 1809",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809"
     },
     {
       "JobName": "nanoserver2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "UseInCI": true,
       "IsLinux": false,
-      "ImageName": "nanoserver2022",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022"
     },
     {
       "JobName": "windowsserver2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
-      "UseInCI": true,
       "IsLinux": false,
-      "ImageName": "windowsserver2022",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022"
     },
     {
       "JobName": "windowsservercore2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
       "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
-      "UseInCI": true,
       "IsLinux": false,
-      "ImageName": "windowsservercore2022",
-      "Channel": "lts",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server Core, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "lts",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022"
     }
   ],
-  "preview": [
+  "stable": [
     {
       "JobName": "alpine313",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false,
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "IsLinux": true,
-      "ImageName": "alpine313",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.13"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.13",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313"
     },
     {
       "JobName": "alpine314",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false,
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "IsLinux": true,
-      "ImageName": "alpine314",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.14"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.14",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314"
     },
     {
-      "JobName": "alpine315",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false,
+      "JobName": "arm32v7",
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
       "IsLinux": true,
-      "ImageName": "alpine315",
-      "Channel": "preview",
-      "DistributionState": "Validating",
-      "OsVersion": "Alpine 3.15 (In Validation)"
+      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7"
     },
     {
       "JobName": "debian10",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "UseInCI": true,
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "IsLinux": true,
-      "ImageName": "debian10",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 10"
+      "ContinueOnError": false,
+      "OsVersion": "Debian 10",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10"
     },
     {
       "JobName": "debian11",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "IsLinux": true,
+      "DistributionState": "Validated",
       "ContinueOnError": false,
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "OsVersion": "Debian 11",
       "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11"
+    },
+    {
+      "JobName": "debian9",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
       "IsLinux": true,
-      "ImageName": "debian11",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 11"
+      "ContinueOnError": false,
+      "OsVersion": "Debian 9",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9"
     },
     {
       "JobName": "mariner2",
-      "EndOfLife": "2022-10-14T00:00:00",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "IsLinux": true,
+      "DistributionState": "Validating",
       "ContinueOnError": false,
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "OsVersion": "Mariner 2.0 (In Validation)",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "mariner2",
-      "Channel": "preview",
-      "DistributionState": "Validated",
-      "OsVersion": "Mariner 2.0"
+      "Channel": "stable",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2"
     },
     {
       "JobName": "ubi84",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
-      "UseInCI": true,
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "IsLinux": true,
-      "ImageName": "ubi84",
-      "Channel": "preview",
       "DistributionState": "Validating",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)"
+      "ContinueOnError": false,
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84"
     },
     {
-      "JobName": "ubi9",
-      "EndOfLife": "2023-05-30T00:00:00",
+      "JobName": "ubuntu16.04",
+      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
+      "IsLinux": true,
+      "DistributionState": "EndOfLife",
       "ContinueOnError": false,
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "OsVersion": "Ubuntu 16.04 (End of Life)",
       "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2021-04-02T00:00:00",
+      "ImageName": "ubuntu16.04"
+    },
+    {
+      "JobName": "ubuntu18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "IsLinux": true,
-      "ImageName": "ubi9",
-      "Channel": "preview",
-      "DistributionState": "ImageCreation",
-      "OsVersion": "Universal Base Image 9"
+      "DistributionState": "Validated",
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 18.04",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04"
     },
     {
       "JobName": "ubuntu20.04",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false,
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "IsLinux": true,
-      "ImageName": "ubuntu20.04",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 20.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 20.04",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04"
     },
     {
       "JobName": "ubuntu22.04",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "UseInCI": true,
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "IsLinux": true,
-      "ImageName": "ubuntu22.04",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 22.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 22.04",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04"
     },
     {
       "JobName": "nanoserver1809",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
-      "UseInCI": true,
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "IsLinux": false,
-      "ImageName": "nanoserver1809",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, version 1809"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, version 1809",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809"
     },
     {
       "JobName": "nanoserver2022",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
-      "UseInCI": true,
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "IsLinux": false,
-      "ImageName": "nanoserver2022",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022"
     },
     {
       "JobName": "windowsserver2022",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
-      "UseInCI": true,
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "IsLinux": false,
-      "ImageName": "windowsserver2022",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022"
     },
     {
       "JobName": "windowsservercore2022",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "UseInCI": true,
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "IsLinux": false,
-      "ImageName": "windowsservercore2022",
-      "Channel": "preview",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server Core, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "stable",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022"
     }
   ],
-  "stable": [
+  "preview": [
     {
       "JobName": "alpine313",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": true,
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
       "IsLinux": true,
-      "ImageName": "alpine313",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.13"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.13",
+      "UseInCI": false,
+      "Channel": "preview",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313"
     },
     {
       "JobName": "alpine314",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "UseInCI": true,
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
       "IsLinux": true,
-      "ImageName": "alpine314",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Alpine 3.14"
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.14",
+      "UseInCI": false,
+      "Channel": "preview",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314"
     },
     {
-      "JobName": "arm32v7",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
-      "UseInCI": true,
+      "JobName": "alpine315",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
       "IsLinux": true,
-      "ImageName": "arm32v7",
-      "Channel": "stable",
-      "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7"
+      "DistributionState": "Validating",
+      "ContinueOnError": false,
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "UseInCI": false,
+      "Channel": "preview",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315"
     },
     {
       "JobName": "debian10",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "UseInCI": true,
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "IsLinux": true,
-      "ImageName": "debian10",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 10"
-    },
-    {
-      "JobName": "debian11",
-      "EndOfLife": "2024-11-30T00:00:00",
       "ContinueOnError": false,
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "OsVersion": "Debian 10",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "debian11",
-      "Channel": "stable",
-      "DistributionState": "Validated",
-      "OsVersion": "Debian 11"
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10"
     },
     {
-      "JobName": "debian9",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "UseInCI": true,
+      "JobName": "debian11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "IsLinux": true,
-      "ImageName": "debian9",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Debian 9"
-    },
-    {
-      "JobName": "mariner1",
-      "EndOfLife": "2022-10-14T00:00:00",
       "ContinueOnError": false,
-      "TagList": "mariner-1.0;7.2-mariner-1.0",
+      "OsVersion": "Debian 11",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "mariner1",
-      "Channel": "stable",
-      "DistributionState": "Validating",
-      "OsVersion": "Mariner 1.0 (In Validation)"
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11"
     },
     {
       "JobName": "mariner2",
-      "EndOfLife": "2022-10-14T00:00:00",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "IsLinux": true,
+      "DistributionState": "Validated",
       "ContinueOnError": false,
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "OsVersion": "Mariner 2.0",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "mariner2",
-      "Channel": "stable",
-      "DistributionState": "Validating",
-      "OsVersion": "Mariner 2.0 (In Validation)"
+      "Channel": "preview",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2"
     },
     {
       "JobName": "ubi84",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "UseInCI": true,
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
       "IsLinux": true,
-      "ImageName": "ubi84",
-      "Channel": "stable",
       "DistributionState": "Validating",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)"
-    },
-    {
-      "JobName": "ubuntu16.04",
-      "EndOfLife": "2021-04-02T00:00:00",
       "ContinueOnError": false,
-      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "ubuntu16.04",
-      "Channel": "stable",
-      "DistributionState": "EndOfLife",
-      "OsVersion": "Ubuntu 16.04 (End of Life)"
+      "Channel": "preview",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84"
     },
     {
-      "JobName": "ubuntu18.04",
-      "EndOfLife": "2023-04-02T00:00:00",
+      "JobName": "ubi9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "IsLinux": true,
+      "DistributionState": "ImageCreation",
       "ContinueOnError": false,
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "OsVersion": "Universal Base Image 9",
       "UseInCI": true,
-      "IsLinux": true,
-      "ImageName": "ubuntu18.04",
-      "Channel": "stable",
-      "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 18.04"
+      "Channel": "preview",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9"
     },
     {
       "JobName": "ubuntu20.04",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "UseInCI": true,
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
       "IsLinux": true,
-      "ImageName": "ubuntu20.04",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 20.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 20.04",
+      "UseInCI": false,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04"
     },
     {
       "JobName": "ubuntu22.04",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "UseInCI": true,
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "IsLinux": true,
-      "ImageName": "ubuntu22.04",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Ubuntu 22.04"
+      "ContinueOnError": false,
+      "OsVersion": "Ubuntu 22.04",
+      "UseInCI": true,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04"
     },
     {
       "JobName": "nanoserver1809",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
-      "UseInCI": true,
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "IsLinux": false,
-      "ImageName": "nanoserver1809",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, version 1809"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, version 1809",
+      "UseInCI": true,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809"
     },
     {
       "JobName": "nanoserver2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "UseInCI": true,
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "IsLinux": false,
-      "ImageName": "nanoserver2022",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Nano Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Nano Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver2022"
     },
     {
       "JobName": "windowsserver2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "UseInCI": true,
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "IsLinux": false,
-      "ImageName": "windowsserver2022",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022"
     },
     {
       "JobName": "windowsservercore2022",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ContinueOnError": false,
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
-      "UseInCI": true,
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "IsLinux": false,
-      "ImageName": "windowsservercore2022",
-      "Channel": "stable",
       "DistributionState": "Validated",
-      "OsVersion": "Windows Server Core, LTSC 2022"
+      "ContinueOnError": false,
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "UseInCI": true,
+      "Channel": "preview",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022"
     }
   ]
 }

From e2343adecc4221b4e42c8890103ffb551b8ce3c6 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 2 Jun 2022 12:40:49 -0700
Subject: [PATCH 219/354] Make matrix JSON consistent (#668)

---
 build.ps1                          | 10 +++++++---
 tools/buildHelper/buildHelper.psm1 | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/build.ps1 b/build.ps1
index b0d44c2fa..64221da70 100755
--- a/build.ps1
+++ b/build.ps1
@@ -611,7 +611,7 @@ End {
 
                         $jobName = $tag.Name -replace '-', '_'
                         if (-not $matrix.$channelName[$osName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
-                            $matrix.$channelName[$osName].Add($jobName, @{
+                            $matrix.$channelName[$osName].Add($jobName, (ConvertTo-SortedDictionary -Hashtable @{
                                     Channel           = $tag.Channel
                                     ImageName         = $tag.Name
                                     JobName           = $jobName
@@ -623,7 +623,7 @@ End {
                                     TagList           = $tag.Tags -join ';'
                                     IsLinux           = $tag.IsLinux
                                     UseInCI           = $tag.UseInCI
-                                })
+                                }))
                         }
                     }
                 }
@@ -634,7 +634,11 @@ End {
             $fullMatrix[$channelName] = @()
             foreach ($osName in $matrix.$channelName.Keys | Sort-Object) {
                 $osMatrix = $matrix.$channelName.$osName
-                $fullMatrix[$channelName] += $osMatrix.Values | Sort-Object -Property ImageName
+                $channelMatrix = [System.Collections.ArrayList]::new()
+                $osMatrix.Values | Sort-Object -Property ImageName | ForEach-Object {
+                    $null = $channelMatrix.Add($_)
+                }
+                $fullMatrix[$channelName] += $channelMatrix
                 $matrixJson = $osMatrix | ConvertTo-Json -Compress
                 $variableName = "matrix_${channelName}_${osName}"
                 if (!$FullJson) {
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index b7ec28c5d..456efd437 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -997,3 +997,16 @@ Function Set-BuildVariable
     # Setting in the current session for the same behavior as the CI and to make it show up in the same task
     Set-Item env:/$name -Value $Value
 }
+
+Function ConvertTo-SortedDictionary {
+    param(
+        [hashtable]
+        $Hashtable
+    )
+
+    $sortedDictionary = [System.Collections.Generic.SortedDictionary[string,object]]::new()
+    foreach($key in $Hashtable.Keys) {
+        $sortedDictionary.Add($key, $Hashtable[$key])
+    }
+    return $sortedDictionary
+}

From e3b26f1049dcabe6285a8e50d83e959fe227bd37 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 19:50:42 +0000
Subject: [PATCH 220/354] Update the matrix json (#669)

* Update the matrix json

* Update vsts-ci.yml

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 assets/matrix.json | 770 ++++++++++++++++++++++-----------------------
 vsts-ci.yml        |   1 +
 2 files changed, 374 insertions(+), 397 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 79e5f4062..253f9badd 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,560 +1,536 @@
 {
   "lts": [
     {
-      "JobName": "alpine313",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "DistributionState": "Validated",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
       "ContinueOnError": false,
-      "OsVersion": "Alpine 3.13",
-      "UseInCI": true,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "UseInCI": true
+    },
+    {
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313"
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "UseInCI": true
     },
     {
-      "JobName": "alpine314",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.14",
-      "UseInCI": true,
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314"
+      "ImageName": "alpine314",
+      "IsLinux": true,
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "UseInCI": true
     },
     {
-      "JobName": "arm32v7",
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "UseInCI": true,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "UseInCI": true
+    },
+    {
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7"
+      "ImageName": "ubuntu18.04",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "JobName": "debian10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 10",
-      "UseInCI": true,
       "Channel": "lts",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "UseInCI": true
     },
     {
-      "JobName": "debian11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 11",
-      "UseInCI": true,
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11"
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "UseInCI": true
     },
     {
-      "JobName": "debian9",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 9",
-      "UseInCI": true,
       "Channel": "lts",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "UseInCI": true
     },
     {
-      "JobName": "mariner2",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "UseInCI": true,
       "Channel": "lts",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
+      "IsLinux": true,
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "JobName": "ubi84",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "UseInCI": true,
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84"
-    },
-    {
-      "JobName": "ubuntu16.04",
-      "TagList": "lts-7.2-ubuntu-xenial;lts-7.2-ubuntu-16.04;lts-ubuntu-xenial;lts-ubuntu-16.04",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "DistributionState": "EndOfLife",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
-      "UseInCI": true,
-      "Channel": "lts",
-      "EndOfLife": "2021-04-02T00:00:00",
-      "ImageName": "ubuntu16.04"
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 18.04",
-      "UseInCI": true,
       "Channel": "lts",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04"
-    },
-    {
-      "JobName": "ubuntu20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
       "ContinueOnError": false,
-      "OsVersion": "Ubuntu 20.04",
-      "UseInCI": true,
-      "Channel": "lts",
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04"
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 22.04",
-      "UseInCI": true,
       "Channel": "lts",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04"
-    },
-    {
-      "JobName": "nanoserver1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
-      "IsLinux": false,
-      "DistributionState": "Validated",
       "ContinueOnError": false,
-      "OsVersion": "Nano Server, version 1809",
-      "UseInCI": true,
-      "Channel": "lts",
+      "DistributionState": "Validated",
       "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809"
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "UseInCI": true
     },
     {
-      "JobName": "nanoserver2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Nano Server, LTSC 2022",
-      "UseInCI": true,
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022"
-    },
-    {
-      "JobName": "windowsserver2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
+      "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "UseInCI": true,
-      "Channel": "lts",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022"
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "windowsservercore2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "UseInCI": true,
       "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022"
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "UseInCI": true
     }
   ],
   "stable": [
     {
-      "JobName": "alpine313",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.13",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313"
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (In Validation)",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "UseInCI": true
     },
     {
-      "JobName": "alpine314",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.14",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "UseInCI": true
     },
     {
-      "JobName": "arm32v7",
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "UseInCI": true
     },
     {
-      "JobName": "debian10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 10",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "IsLinux": true,
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "UseInCI": true
     },
     {
-      "JobName": "debian11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 11",
-      "UseInCI": true,
       "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11"
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "UseInCI": true
     },
     {
-      "JobName": "debian9",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 9",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "JobName": "mariner2",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "UseInCI": true
     },
     {
-      "JobName": "ubi84",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu16.04",
-      "TagList": "7.2-ubuntu-xenial;7.2-ubuntu-16.04;ubuntu-xenial;ubuntu-16.04",
-      "IsLinux": true,
-      "DistributionState": "EndOfLife",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 16.04 (End of Life)",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2021-04-02T00:00:00",
-      "ImageName": "ubuntu16.04"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 18.04",
-      "UseInCI": true,
       "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04"
+      "ImageName": "arm32v7",
+      "IsLinux": true,
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 20.04",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04"
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "IsLinux": true,
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 22.04",
-      "UseInCI": true,
       "Channel": "stable",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "nanoserver1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Nano Server, version 1809",
-      "UseInCI": true,
       "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809"
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "UseInCI": true
     },
     {
-      "JobName": "nanoserver2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Nano Server, LTSC 2022",
-      "UseInCI": true,
       "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022"
-    },
-    {
-      "JobName": "windowsserver2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
+      "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "UseInCI": true,
-      "Channel": "stable",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022"
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "windowsservercore2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "UseInCI": true,
       "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022"
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "UseInCI": true
     }
   ],
   "preview": [
     {
-      "JobName": "alpine313",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.13",
-      "UseInCI": false,
       "Channel": "preview",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "UseInCI": true
     },
     {
-      "JobName": "alpine314",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.14",
-      "UseInCI": false,
       "Channel": "preview",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314"
+      "ContinueOnError": false,
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "UseInCI": true
     },
     {
-      "JobName": "alpine315",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "UseInCI": false,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315"
+      "ImageName": "alpine315",
+      "IsLinux": true,
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
-      "JobName": "debian10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Debian 10",
-      "UseInCI": true,
       "Channel": "preview",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
     },
     {
-      "JobName": "debian11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
-      "IsLinux": true,
+      "Channel": "preview",
+      "ContinueOnError": false,
       "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "IsLinux": true,
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
+    },
+    {
+      "Channel": "preview",
       "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
       "OsVersion": "Debian 11",
-      "UseInCI": true,
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "UseInCI": true
+    },
+    {
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11"
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "UseInCI": true
     },
     {
-      "JobName": "mariner2",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Mariner 2.0",
-      "UseInCI": true,
       "Channel": "preview",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "JobName": "ubi84",
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
-      "IsLinux": true,
-      "DistributionState": "Validating",
-      "ContinueOnError": false,
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "UseInCI": true,
       "Channel": "preview",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84"
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "UseInCI": true
     },
     {
-      "JobName": "ubi9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
-      "IsLinux": true,
-      "DistributionState": "ImageCreation",
-      "ContinueOnError": false,
-      "OsVersion": "Universal Base Image 9",
-      "UseInCI": true,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9"
+      "ImageName": "ubi84",
+      "IsLinux": true,
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 20.04",
-      "UseInCI": false,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04"
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "ubuntu22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "IsLinux": true,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Ubuntu 22.04",
-      "UseInCI": true,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04"
-    },
-    {
-      "JobName": "nanoserver1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
+      "JobName": "nanoserver1809",
       "OsVersion": "Nano Server, version 1809",
-      "UseInCI": true,
-      "Channel": "preview",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809"
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "UseInCI": true
     },
     {
-      "JobName": "nanoserver2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Nano Server, LTSC 2022",
-      "UseInCI": true,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022"
-    },
-    {
-      "JobName": "windowsserver2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
+      "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "UseInCI": true,
-      "Channel": "preview",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022"
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "UseInCI": true
     },
     {
-      "JobName": "windowsservercore2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "IsLinux": false,
-      "DistributionState": "Validated",
-      "ContinueOnError": false,
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "UseInCI": true,
       "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022"
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "UseInCI": true
     }
   ]
 }
diff --git a/vsts-ci.yml b/vsts-ci.yml
index f4194e15c..c0cabc51a 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -12,6 +12,7 @@ pr:
     exclude:
     - .github/*
     - .vsts-ci/releasebuild.yml
+    - assets/matrix.json
 
 resources:
 - repo: self

From 2f680b581146f3da00bc489a2a4cfcfdfacf11c7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Jun 2022 12:16:41 -0700
Subject: [PATCH 221/354] Add tar to mariner stable (#671)

* Add tar to mariner stable

* Add tar to preview image on mariner2

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 release/7-2/mariner2/test-deps/docker/Dockerfile | 1 +
 release/7-3/mariner2/test-deps/docker/Dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
index 4b8fb9db3..319c12e0f 100644
--- a/release/7-2/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-2/mariner2/test-deps/docker/Dockerfile
@@ -23,6 +23,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     git \
     mariner-repos-microsoft-preview \
     net-tools \
+    tar \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
index 4b8fb9db3..319c12e0f 100644
--- a/release/7-3/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-3/mariner2/test-deps/docker/Dockerfile
@@ -23,6 +23,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     git \
     mariner-repos-microsoft-preview \
     net-tools \
+    tar \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data

From 130da2dfaeade33d17958d5263c878265a631612 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Jun 2022 14:46:45 -0700
Subject: [PATCH 222/354] Make mariner use rpm file (#672)

* Make mariner use rpm file

* fix indentation

* use buildkit on windows
---
 build.ps1                              |  4 +---
 release/7-3/mariner2/docker/Dockerfile | 32 ++++++++++++++++++++------
 release/7-3/mariner2/meta.json         |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 64221da70..e186e441f 100755
--- a/build.ps1
+++ b/build.ps1
@@ -225,9 +225,7 @@ Begin {
         $Name = $null
     }
 
-    if (!$IsWindows) {
-        $ENV:DOCKER_BUILDKIT = 1
-    }
+    $ENV:DOCKER_BUILDKIT = 1
 
     if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index 3135c4395..7bea6f00f 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -1,6 +1,20 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.4
+ARG PS_PACKAGE=powershell-preview-${PS_VERSION}-1.cm1.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
 ARG PS_VERSION=7.3.0-preview.4
@@ -29,12 +43,16 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     # required for SSH
     openssh-clients \
     ca-certificates \
-    powershell-preview \
+    dotnet-runtime-7.0 \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
     && tdnf clean all
 
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    rpm -i /mnt/rpm/powershell.rpm
+
 # Create the pwsh symbolic link that points to powershell
 RUN ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
 
@@ -45,12 +63,12 @@ RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
         -NoLogo \
         -NoProfile \
         -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
+            \$ErrorActionPreference = 'Stop' ; \
+            \$ProgressPreference = 'SilentlyContinue' ; \
+            while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                Start-Sleep -Seconds 6 ; \
+            }"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index c0a585371..94589b2f1 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -1,6 +1,6 @@
 {
     "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm1.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Mariner 2.0",
     "shortTags": [

From 26cc4489444b1b6659d16bdb930e0dd6ab4630c9 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Fri, 17 Jun 2022 15:31:50 -0400
Subject: [PATCH 223/354] Remove manifest list from ubuntu20.04 (#674)

---
 release/7-2/ubuntu20.04/meta.json | 3 ---
 release/7-3/ubuntu20.04/meta.json | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/release/7-2/ubuntu20.04/meta.json b/release/7-2/ubuntu20.04/meta.json
index 14b33330d..9c5fe7c54 100644
--- a/release/7-2/ubuntu20.04/meta.json
+++ b/release/7-2/ubuntu20.04/meta.json
@@ -12,9 +12,6 @@
         {"Tag": "focal"},
         {"Tag": "20.04"}
     ],
-    "manifestLists": [
-        "latest"
-    ],
     "TestProperties": {
         "size": 355
     },
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
index 30aed21c4..c382c7671 100644
--- a/release/7-3/ubuntu20.04/meta.json
+++ b/release/7-3/ubuntu20.04/meta.json
@@ -9,9 +9,6 @@
         {"Tag": "focal"},
         {"Tag": "20.04"}
     ],
-    "manifestLists": [
-        "preview"
-    ],
     "TestProperties": {
         "size": 355
     },

From a4fb59f0dd7db89b8834948647cd065d3e143e7d Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 21 Jun 2022 15:27:48 -0400
Subject: [PATCH 224/354] ubi9 test deps Dockerfile should be using Ubi9 base
 image, fixed typo (#675)

---
 release/7-3/ubi9/test-deps/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-3/ubi9/test-deps/docker/Dockerfile
index 0c72d54ba..0265a46f1 100644
--- a/release/7-3/ubi9/test-deps/docker/Dockerfile
+++ b/release/7-3/ubi9/test-deps/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
 
 FROM ${BaseImage}
 

From 84a9d3c8bb2075bf43e314df590e56f31889fa26 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:41:41 -0700
Subject: [PATCH 225/354] Update the release build yaml with the latest
 versions (#676)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 6337e1c2e..e03dfe7f1 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.3.0-preview.4'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.4'
+    default: 'v7.2.5'
   - name: 'stableReleaseTag'
-    default: 'v7.2.4'
+    default: 'v7.2.5'
 
 resources:
 - repo: self

From 44f7901cd6285435bb69d9f4f50541e779021176 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 23 Jun 2022 14:20:22 -0700
Subject: [PATCH 226/354] Update mariner images for PowerShell 7.2.5 release
 (#677)

* Update mariner images for PowerShell 7.2.5 release

* fix test failures
---
 release/7-2/mariner2/docker/Dockerfile        | 67 +++++++------------
 release/7-2/mariner2/meta.json                |  6 +-
 .../7-2/mariner2/test-deps/docker/Dockerfile  |  5 +-
 release/7-3/mariner2/docker/Dockerfile        |  8 ++-
 release/7-3/mariner2/meta.json                |  2 +-
 .../7-3/mariner2/test-deps/docker/Dockerfile  |  2 -
 6 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/release/7-2/mariner2/docker/Dockerfile b/release/7-2/mariner2/docker/Dockerfile
index b084f0e73..8cc9c3fff 100644
--- a/release/7-2/mariner2/docker/Dockerfile
+++ b/release/7-2/mariner2/docker/Dockerfile
@@ -4,41 +4,22 @@
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_VERSION=7.2.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-1.cm1.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
 # Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
 RUN echo ${PS_PACKAGE_URL}
 
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Install tar a gzip so we can unzip the tar.gz
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y \
-    tar \
-    gzip \
-    && tdnf clean all
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
-ARG PS_VERSION=7.3.0-preview.1
+ARG PS_VERSION=7.2.5
 ARG PS_INSTALL_VERSION=7-preview
 
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -52,7 +33,9 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
 
 # Install dependencies and clean up
-RUN tdnf update -y \
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y mariner-repos-microsoft-preview \
+    && tdnf update -y \
     # install dependencies
     && tdnf install -y \
     # required for localization
@@ -62,32 +45,32 @@ RUN tdnf update -y \
     # required for SSH
     openssh-clients \
     ca-certificates \
+    dotnet-runtime-6.0 \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
-    && tdnf clean all \
-    # remove cache folders and files
-    && rm -rf /var/cache/yum
+    && tdnf clean all
+
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    rpm -i /mnt/rpm/powershell.rpm
+
+# Create the pwsh symbolic link that points to powershell
+RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
 
-# Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+# intialize powershell module cache
+# and disable telemetry for this ONE session
+RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \
         -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
+            \$ErrorActionPreference = 'Stop' ; \
+            \$ProgressPreference = 'SilentlyContinue' ; \
+            while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                Start-Sleep -Seconds 6 ; \
+            }"
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/7-2/mariner2/meta.json b/release/7-2/mariner2/meta.json
index a1cb1d607..58d299216 100644
--- a/release/7-2/mariner2/meta.json
+++ b/release/7-2/mariner2/meta.json
@@ -1,6 +1,6 @@
 {
     "IsLinux" : true,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Mariner 2.0",
     "shortTags": [
@@ -9,8 +9,8 @@
     "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 760
+        "size": 387
     },
     "EndOfLife": "2022-10-14",
-    "DistributionState": "Validating"
+    "DistributionState": "Validated"
 }
diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
index 319c12e0f..9510b2984 100644
--- a/release/7-2/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-2/mariner2/test-deps/docker/Dockerfile
@@ -8,9 +8,8 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
     # install dependencies
-    && tdnf install -y \
+    tdnf install -y \
     dnf-utils \
     sudo \
     curl \
@@ -24,8 +23,6 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     mariner-repos-microsoft-preview \
     net-tools \
     tar \
-    # upgrade packages
-    && tdnf upgrade -y \
     # clean cached data
     && tdnf clean all
 
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index 7bea6f00f..3e1f57555 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -35,9 +35,11 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
 # Install dependencies and clean up
 RUN --mount=type=cache,target=/var/cache/tdnf \
     tdnf install -y mariner-repos-microsoft-preview \
-    && tdnf update -y \
+    && tdnf makecache \
     # install dependencies
     && tdnf install -y \
+    # required for localization
+    icu \
     # required for help in PowerShell
     less \
     # required for SSH
@@ -54,7 +56,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf,rw \
     rpm -i /mnt/rpm/powershell.rpm
 
 # Create the pwsh symbolic link that points to powershell
-RUN ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
 
 # intialize powershell module cache
 # and disable telemetry for this ONE session
@@ -72,4 +74,4 @@ RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
 
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh-preview" ]
+CMD [ "pwsh" ]
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index 94589b2f1..58d299216 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -1,6 +1,6 @@
 {
     "IsLinux" : true,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm1.x86_64.rpm",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
     "osVersion": "Mariner 2.0",
     "shortTags": [
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
index 319c12e0f..7b595e1f5 100644
--- a/release/7-3/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-3/mariner2/test-deps/docker/Dockerfile
@@ -24,8 +24,6 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     mariner-repos-microsoft-preview \
     net-tools \
     tar \
-    # upgrade packages
-    && tdnf upgrade -y \
     # clean cached data
     && tdnf clean all
 

From 7a616b05eb857167e52443b6cb74c12f4837fa7c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 10:31:29 -0700
Subject: [PATCH 227/354] Update the matrix json (#681)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 522 ++++++++++++++++++++++-----------------------
 1 file changed, 261 insertions(+), 261 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 253f9badd..2672a0dab 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,43 +1,43 @@
 {
-  "lts": [
+  "stable": [
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -45,23 +45,23 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
@@ -69,35 +69,35 @@
       "IsLinux": true,
       "JobName": "ubuntu18.04",
       "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-06-01T00:00:00",
@@ -105,59 +105,47 @@
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -165,49 +153,37 @@
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "UseInCI": true
-    }
-  ],
-  "stable": [
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
-      "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (In Validation)",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
-    },
+    }
+  ],
+  "preview": [
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -215,205 +191,205 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": true
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "debian11",
       "IsLinux": true,
       "JobName": "debian11",
       "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "UseInCI": true
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ],
-  "preview": [
+  "lts": [
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
+      "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
-      "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -421,115 +397,139 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ]

From bb2727cf06528d4e7051c2c2a9ce9b6447cc5899 Mon Sep 17 00:00:00 2001
From: "msftbot[bot]" <48340428+msftbot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 11:09:37 -0700
Subject: [PATCH 228/354] Add `.github/fabricbot.json` (#680)

Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com>
---
 .github/fabricbot.json | 1556 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1556 insertions(+)
 create mode 100644 .github/fabricbot.json

diff --git a/.github/fabricbot.json b/.github/fabricbot.json
new file mode 100644
index 000000000..f18bb92bb
--- /dev/null
+++ b/.github/fabricbot.json
@@ -0,0 +1,1556 @@
+{
+  "version": "1.0",
+  "tasks": [
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestReviewResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Add needs author feedback label to pull requests when changes are requested",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isAction",
+              "parameters": {
+                "action": "submitted"
+              }
+            },
+            {
+              "name": "isReviewState",
+              "parameters": {
+                "state": "changes_requested"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "addLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "pull_request_review"
+        ]
+      },
+      "id": "4JyuQNRCDV"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove needs author feedback label when the author responds to a pull request",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isActivitySender",
+              "parameters": {
+                "user": {
+                  "type": "author"
+                }
+              }
+            },
+            {
+              "operator": "not",
+              "operands": [
+                {
+                  "name": "isAction",
+                  "parameters": {
+                    "action": "closed"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Waiting on Author"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "pull_request",
+          "issues",
+          "project_card"
+        ]
+      },
+      "id": "yxEFtCSRPm"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestCommentResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove needs author feedback label when the author comments on a pull request",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isActivitySender",
+              "parameters": {
+                "user": {
+                  "type": "author"
+                }
+              }
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Waiting on Author"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "issue_comment"
+        ]
+      },
+      "id": "cHbbgTCfiU"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestReviewResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove needs author feedback label when the author responds to a pull request review comment",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isActivitySender",
+              "parameters": {
+                "user": {
+                  "type": "author"
+                }
+              }
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Waiting on Author"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "pull_request_review"
+        ]
+      },
+      "id": "onD1b_PsZU"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove no recent activity label from pull requests",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "operator": "not",
+              "operands": [
+                {
+                  "name": "isAction",
+                  "parameters": {
+                    "action": "closed"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Stale"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "pull_request",
+          "issues",
+          "project_card"
+        ]
+      },
+      "id": "tiWP8l9foC"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestCommentResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove no recent activity label when a pull request is commented on",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Stale"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "issue_comment"
+        ]
+      },
+      "id": "z9mLSvtXcC"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "PullRequestReviewResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove no recent activity label when a pull request is reviewed",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Stale"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "eventType": "pull_request",
+        "eventNames": [
+          "pull_request_review"
+        ]
+      },
+      "id": "NlGGl_D-3P"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close stale pull requests",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              0,
+              12
+            ]
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              0,
+              12
+            ]
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isPr",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 7
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "0wPH-MnpIT"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Add no recent activity label to pull requests",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              6,
+              18
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isPr",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 7
+            }
+          },
+          {
+            "name": "noLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          },
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**."
+            }
+          }
+        ]
+      },
+      "id": "fwFnu-R1wS"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "AutoMerge",
+      "subCapability": "AutoMerge",
+      "version": "1.0",
+      "config": {
+        "taskName": "Automatically merge pull requests",
+        "label": "AutoMerge",
+        "silentMode": false,
+        "minMinutesOpen": "1440",
+        "mergeType": "squash",
+        "deleteBranches": true,
+        "removeLabelOnPush": true,
+        "minimumNumberOfStatuses": 2
+      },
+      "id": "jfUy-UApGV",
+      "disabled": false
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "IssuesOnlyResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Add needs triage label to new issues",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isAction",
+              "parameters": {
+                "action": "opened"
+              }
+            },
+            {
+              "operator": "not",
+              "operands": [
+                {
+                  "name": "isPartOfProject",
+                  "parameters": {}
+                }
+              ]
+            },
+            {
+              "operator": "not",
+              "operands": [
+                {
+                  "name": "isAssignedToSomeone",
+                  "parameters": {}
+                }
+              ]
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "addLabel",
+            "parameters": {
+              "label": "Needs: Triage :mag:"
+            }
+          },
+          {
+            "name": "assignToUser",
+            "parameters": {
+              "teamName": "PowerShell",
+              "user": "travisez13",
+              "cutoff": {
+                "rotationWeekday": 1,
+                "hoursBefore": 0
+              }
+            }
+          }
+        ],
+        "eventType": "issue",
+        "eventNames": [
+          "issues",
+          "project_card"
+        ]
+      },
+      "id": "FnXS1oXWC"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "IssueCommentResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Replace needs author feedback label with needs attention label when the author comments on an issue",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "isAction",
+              "parameters": {
+                "action": "created"
+              }
+            },
+            {
+              "name": "isActivitySender",
+              "parameters": {
+                "user": {
+                  "type": "author"
+                }
+              }
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Waiting on Author"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "addLabel",
+            "parameters": {
+              "label": "Needs: Attention :wave:"
+            }
+          },
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ],
+        "eventType": "issue",
+        "eventNames": [
+          "issue_comment"
+        ]
+      },
+      "id": "KGfnEUp5gm"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "IssuesOnlyResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove no recent activity label from issues",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "operator": "not",
+              "operands": [
+                {
+                  "name": "isAction",
+                  "parameters": {
+                    "action": "closed"
+                  }
+                }
+              ]
+            },
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Stale"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "eventType": "issue",
+        "eventNames": [
+          "issues",
+          "project_card"
+        ]
+      },
+      "id": "_XP_zzsOkE"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "IssueCommentResponder",
+      "version": "1.0",
+      "config": {
+        "taskName": "Remove no recent activity label when an issue is commented on",
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "hasLabel",
+              "parameters": {
+                "label": "Stale"
+              }
+            }
+          ]
+        },
+        "actions": [
+          {
+            "name": "removeLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "eventType": "issue",
+        "eventNames": [
+          "issue_comment"
+        ]
+      },
+      "id": "ZaOF1J5Ic1"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close stale issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              8,
+              20
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 10
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "_iyk0q9nL-"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Add no recent activity label to issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 30
+            }
+          },
+          {
+            "name": "noLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          },
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **30 days**. It will be closed if no further activity occurs **within 10 days of this comment**."
+            }
+          }
+        ]
+      },
+      "id": "IOT0g54X1L"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close duplicate issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              0,
+              3,
+              6,
+              9,
+              12,
+              15,
+              18,
+              21
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Resolution-Duplicate"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 1
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+            }
+          },
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "GegpTQKntV"
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "ReleaseAnnouncement",
+      "subCapability": "ReleaseAnnouncement",
+      "version": "1.0",
+      "config": {
+        "taskName": "Announce a fix has been released",
+        "prReply": ":tada:`${version}` has been released which incorporates this pull request.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
+        "issueReply": ":tada:This issue was addressed in #${prNumber}, which has now been successfully released as `${version}`.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
+        "packageRegex": "(.*) - (\\d*)",
+        "referencedPrsRegex": "\\(#(\\d+)\\)",
+        "packageNameGroup": 1,
+        "packageVersionGroup": 2
+      },
+      "id": "GUVgGZkt8"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close fixed issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              1,
+              4,
+              7,
+              10,
+              13,
+              16,
+              19,
+              22
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Resolution-Fixed"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 1
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+            }
+          },
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "BecGtfGWA"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close answered issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Resolution-Answered"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 1
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+            }
+          },
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "2CswV02vu2"
+    },
+    {
+      "taskType": "scheduled",
+      "capabilityId": "ScheduledSearch",
+      "subCapability": "ScheduledSearch",
+      "version": "1.1",
+      "config": {
+        "taskName": "Close external issues",
+        "frequency": [
+          {
+            "weekDay": 0,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 1,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 2,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 3,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 4,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 5,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          },
+          {
+            "weekDay": 6,
+            "hours": [
+              2,
+              5,
+              8,
+              11,
+              14,
+              17,
+              20,
+              23
+            ],
+            "timezoneOffset": -8
+          }
+        ],
+        "searchTerms": [
+          {
+            "name": "isIssue",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Resolution-External"
+            }
+          },
+          {
+            "name": "noActivitySince",
+            "parameters": {
+              "days": 1
+            }
+          }
+        ],
+        "actions": [
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes."
+            }
+          },
+          {
+            "name": "closeIssue",
+            "parameters": {}
+          }
+        ]
+      },
+      "id": "iU5Km68qAs"
+    }
+  ],
+  "userGroups": []
+}

From 4df7e61e7210106cf1bbc61dc9eef8603fc618c6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 11:10:05 -0700
Subject: [PATCH 229/354] Update the release build yaml with the latest
 versions (#678)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index e03dfe7f1..71583b82b 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.4'
+    default: 'v7.3.0-preview.5'
   - name: 'ltsReleaseTag'
     default: 'v7.2.5'
   - name: 'stableReleaseTag'

From 5af1efd43eab9859e23050eeabb150472772b73d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 11:17:02 -0700
Subject: [PATCH 230/354] Update the matrix json (#683)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 474 ++++++++++++++++++++++-----------------------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 2672a0dab..a78357fad 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,7 +1,7 @@
 {
-  "stable": [
+  "lts": [
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -9,35 +9,23 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -45,59 +33,59 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-06-01T00:00:00",
@@ -105,23 +93,35 @@
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2032-04-01T00:00:00",
@@ -129,11 +129,11 @@
       "IsLinux": true,
       "JobName": "ubuntu22.04",
       "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -141,11 +141,11 @@
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -153,37 +153,37 @@
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     }
   ],
-  "preview": [
+  "stable": [
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -191,35 +191,23 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -227,47 +215,71 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "arm32v7",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "JobName": "arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "IsLinux": true,
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-10-14T00:00:00",
@@ -275,85 +287,85 @@
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2032-04-01T00:00:00",
       "ImageName": "ubuntu22.04",
       "IsLinux": true,
       "JobName": "ubuntu22.04",
       "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     }
   ],
-  "lts": [
+  "preview": [
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -361,35 +373,11 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
-      "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
-      "UseInCI": true
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -397,139 +385,151 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "UseInCI": true
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu22.04",
       "IsLinux": true,
       "JobName": "ubuntu22.04",
       "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     }
   ]

From 2152ee5b902c19eb663b5476f33d2cef270f621d Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 18 Jul 2022 14:17:41 -0400
Subject: [PATCH 231/354] add ubi images to latest and preview manifest lists
 (#679)

* add ubi stable image to latest manifest list, preview ubi to preview manifest list

* rename manifest lists ubi9 and ubi8.4 (for 7-2) will be part of
---
 release/7-2/ubi84/meta.json | 3 +++
 release/7-3/ubi9/meta.json  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/release/7-2/ubi84/meta.json b/release/7-2/ubi84/meta.json
index 56fe3af28..1a9b73de9 100644
--- a/release/7-2/ubi84/meta.json
+++ b/release/7-2/ubi84/meta.json
@@ -11,6 +11,9 @@
     "shortTags": [
         {"Tag": "8.4"}
     ],
+    "manifestLists": [
+        "ubi"
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 725
diff --git a/release/7-3/ubi9/meta.json b/release/7-3/ubi9/meta.json
index b65f0d6ed..09bd606c1 100644
--- a/release/7-3/ubi9/meta.json
+++ b/release/7-3/ubi9/meta.json
@@ -8,6 +8,9 @@
     "shortTags": [
         {"Tag": "9"}
     ],
+    "manifestLists": [
+        "ubi-preview"
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 502

From 67082ce94151d62e9e539e2dcc94b052b5a2857a Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 18 Jul 2022 14:27:35 -0400
Subject: [PATCH 232/354] add arm32 ubuntu20 images and fix tag syntax for
 arm32 ubuntu18 (#682)

* add arm32 ubuntu20 images and fix tag syntax for arm32 ubuntu18

* change to update ubuntu20.04 didn't commit earlier, fix duplicate tag

* add ubuntu22.04 arm image, update psversion for ubuntu18 and 20 arm

* Revert change to ubuntu20 image

* add ubuntu22 arm image for preview, fix distribution channel typo for ubuntu20 arm image

* psversion for 7-3 should be preview versions

* add latest version ubuntu arm images to latest and preview manifest lists
---
 .../docker/Dockerfile                         |  8 +--
 .../meta.json                                 |  4 +-
 .../7-2/ubuntu20.04-arm32v7/docker/Dockerfile | 70 +++++++++++++++++++
 release/7-2/ubuntu20.04-arm32v7/meta.json     | 23 ++++++
 .../7-2/ubuntu22.04-arm32v7/docker/Dockerfile | 70 +++++++++++++++++++
 release/7-2/ubuntu22.04-arm32v7/meta.json     | 26 +++++++
 .../7-3/ubuntu20.04-arm32v7/docker/Dockerfile | 59 ++++++++++++++++
 release/7-3/ubuntu20.04-arm32v7/meta.json     | 23 ++++++
 .../7-3/ubuntu22.04-arm32v7/docker/Dockerfile | 60 ++++++++++++++++
 release/7-3/ubuntu22.04-arm32v7/meta.json     | 26 +++++++
 10 files changed, 363 insertions(+), 6 deletions(-)
 rename release/7-2/{arm32v7 => ubuntu18.04-arm32v7}/docker/Dockerfile (93%)
 rename release/7-2/{arm32v7 => ubuntu18.04-arm32v7}/meta.json (85%)
 create mode 100644 release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-2/ubuntu20.04-arm32v7/meta.json
 create mode 100644 release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-2/ubuntu22.04-arm32v7/meta.json
 create mode 100644 release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-3/ubuntu20.04-arm32v7/meta.json
 create mode 100644 release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-3/ubuntu22.04-arm32v7/meta.json

diff --git a/release/7-2/arm32v7/docker/Dockerfile b/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
similarity index 93%
rename from release/7-2/arm32v7/docker/Dockerfile
rename to release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
index 840e68f81..c7b230d75 100644
--- a/release/7-2/arm32v7/docker/Dockerfile
+++ b/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
-FROM arm32v7/ubuntu:bionic AS installer-env
+FROM --platform=linux/arm/v7 ubuntu:bionic AS installer-env
 
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
 ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7
@@ -36,11 +36,11 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM arm32v7/ubuntu:bionic AS final-image
+FROM --platform=linux/arm/v7 ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.2.3
 
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     \
diff --git a/release/7-2/arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
similarity index 85%
rename from release/7-2/arm32v7/meta.json
rename to release/7-2/ubuntu18.04-arm32v7/meta.json
index 1de5cccd9..78dd9bbe9 100644
--- a/release/7-2/arm32v7/meta.json
+++ b/release/7-2/ubuntu18.04-arm32v7/meta.json
@@ -7,8 +7,8 @@
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
-        "#psversion#-arm32v7-ubuntu-#shorttag#",
-        "arm32v7-ubuntu-#shorttag#"
+        "#psversion#-ubuntu-#shorttag#-arm32",
+        "ubuntu-#shorttag#-arm32"
     ],
     "shortTags": [
         {"Tag": "bionic"},
diff --git a/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..21656372d
--- /dev/null
+++ b/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,70 @@
+# Copyright (c) Microsoft Corporation. 
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+
+ARG PS_VERSION=7.2.3
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ARG PS_VERSION=7.2.3
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu20.04-arm32v7/meta.json b/release/7-2/ubuntu20.04-arm32v7/meta.json
new file mode 100644
index 000000000..0252aa839
--- /dev/null
+++ b/release/7-2/ubuntu20.04-arm32v7/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 20.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-arm32",
+        "ubuntu-#shorttag#-arm32"
+    ],
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..881942e99
--- /dev/null
+++ b/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,70 @@
+# Copyright (c) Microsoft Corporation. 
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
+
+ARG PS_VERSION=7.2.4
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ARG PS_VERSION=7.2.4
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl3 libicu70 less --yes
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
new file mode 100644
index 000000000..3059f226a
--- /dev/null
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -0,0 +1,26 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 22.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "#psversion#-ubuntu-#shorttag#-arm32",
+        "ubuntu-#shorttag#-arm32"
+    ],
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "manifestLists": [
+        "latest"
+    ],
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..5a66df083
--- /dev/null
+++ b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,59 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+
+ARG PS_VERSION=7.3.0-preview.3
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+ARG PS_PACKAGE_URL_BASE64
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+RUN ls -l /tmp/powershell.tar.gz
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.3.0-preview.3
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libssl1.0 libicu60 less --yes
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
new file mode 100644
index 000000000..7fc05d290
--- /dev/null
+++ b/release/7-3/ubuntu20.04-arm32v7/meta.json
@@ -0,0 +1,23 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 20.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "preview-#psversion#-ubuntu-#shorttag#-arm32",
+        "preview-ubuntu-#shorttag#-arm32"
+    ],
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..e22fcd460
--- /dev/null
+++ b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,60 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
+
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+ARG PS_PACKAGE_URL_BASE64
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+RUN ls -l /tmp/powershell.tar.gz
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:jammy AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libssl3 libicu70 less --yes
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
new file mode 100644
index 000000000..3372b69fb
--- /dev/null
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -0,0 +1,26 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 22.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "Base64EncodePackageUrl": true,
+    "UseAcr": true,
+    "tagTemplates": [
+        "preview-#psversion#-ubuntu-#shorttag#-arm32",
+        "preview-ubuntu-#shorttag#-arm32"
+    ],
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "manifestLists": [
+        "preview"
+    ],
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated"
+}

From d2192be203aa0adb2196fe85e7c907ecf7580a79 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:45:09 -0700
Subject: [PATCH 233/354] Update the release build yaml with the latest
 versions (#688)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 71583b82b..bbcb62d25 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.5'
+    default: 'v7.3.0-preview.6'
   - name: 'ltsReleaseTag'
     default: 'v7.2.5'
   - name: 'stableReleaseTag'

From e6988f0d4cc138cf04cb58cb0bdb367bfd58ad1e Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 19 Jul 2022 15:37:59 -0400
Subject: [PATCH 234/354] Remove TagTemplates for Ubuntu preview arm images
 (#689)

* remove tagTemplates from ubuntu arm meta json files and specify processor architecture in shortTags

* Update stage.yml

* specify shortDistroName for ubuntu arm images and add error handling to detect if image metadata contains doesnt contain both shortDistroName and TagTemplates

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/stage.yml                        | 7 ++++++-
 release/7-2/ubuntu18.04-arm32v7/meta.json | 1 +
 release/7-2/ubuntu20.04-arm32v7/meta.json | 1 +
 release/7-2/ubuntu22.04-arm32v7/meta.json | 1 +
 release/7-3/ubuntu20.04-arm32v7/meta.json | 9 +++------
 release/7-3/ubuntu22.04-arm32v7/meta.json | 9 +++------
 tools/buildHelper/buildHelper.psm1        | 5 +++++
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index 721c561d0..4782d3926 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -20,7 +20,12 @@ stages:
       displayName: Generate Matrix YAML ${{ parameters.channel }}
       steps:
       - pwsh: |
-          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+          try {
+             ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
+          } catch {
+             Get-Error $_
+             throw
+          }
         displayName: Generate Matrix YAML
         condition: succeededOrFailed()
         name: matrix
diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
index 78dd9bbe9..13c4bac50 100644
--- a/release/7-2/ubuntu18.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu18.04-arm32v7/meta.json
@@ -4,6 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
     "osVersion": "Ubuntu 18.04 ARM 32v7",
     "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
diff --git a/release/7-2/ubuntu20.04-arm32v7/meta.json b/release/7-2/ubuntu20.04-arm32v7/meta.json
index 0252aa839..230f47834 100644
--- a/release/7-2/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu20.04-arm32v7/meta.json
@@ -4,6 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
     "osVersion": "Ubuntu 20.04 ARM 32v7",
     "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
index 3059f226a..3b9e536d2 100644
--- a/release/7-2/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -4,6 +4,7 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
     "osVersion": "Ubuntu 22.04 ARM 32v7",
     "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
     "tagTemplates": [
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
index 7fc05d290..d9948e578 100644
--- a/release/7-3/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu20.04-arm32v7/meta.json
@@ -4,15 +4,12 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
     "osVersion": "Ubuntu 20.04 ARM 32v7",
     "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
-    "tagTemplates": [
-        "preview-#psversion#-ubuntu-#shorttag#-arm32",
-        "preview-ubuntu-#shorttag#-arm32"
-    ],
     "shortTags": [
-        {"Tag": "focal"},
-        {"Tag": "20.04"}
+        {"Tag": "focal-arm32"},
+        {"Tag": "20.04-arm32"}
     ],
     "TestProperties": {
         "size": 550,
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
index 3372b69fb..700806e37 100644
--- a/release/7-3/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -4,15 +4,12 @@
     "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
     "osVersion": "Ubuntu 22.04 ARM 32v7",
     "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
     "UseAcr": true,
-    "tagTemplates": [
-        "preview-#psversion#-ubuntu-#shorttag#-arm32",
-        "preview-ubuntu-#shorttag#-arm32"
-    ],
     "shortTags": [
-        {"Tag": "jammy"},
-        {"Tag": "22.04"}
+        {"Tag": "jammy-arm32"},
+        {"Tag": "22.04-arm32"}
     ],
     "TestProperties": {
         "size": 550,
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 456efd437..d19c74dc3 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -171,6 +171,11 @@ class DockerImageMetaData {
             )
         }
 
+        if (!$this.TagTemplates -and !$this.ShortDistroName)
+        {
+            throw "Image does not contain tag templates and short distro name and must contain one."
+        }
+
         switch -RegEx ($this.GetDistributionState()) {
             'Unknown|Validating' {
                 $this.OsVersion = $this.OsVersion + ' (In Validation)'

From 87196ae34f8a81258a5ccb4cf0d463578bdd2991 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Jul 2022 10:52:01 -0700
Subject: [PATCH 235/354] Update the matrix json (#687)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 418 ++++++++++++++++++++++++++-------------------
 1 file changed, 245 insertions(+), 173 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index a78357fad..9aa1b3290 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,5 +1,41 @@
 {
   "lts": [
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
+    },
     {
       "Channel": "lts",
       "ContinueOnError": false,
@@ -17,11 +53,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "ImageName": "ubuntu18.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
       "UseInCI": true
     },
     {
@@ -40,36 +76,24 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-arm32v7-ubuntu-bionic;lts-7.2-arm32v7-ubuntu-18.04;lts-arm32v7-ubuntu-bionic;lts-arm32v7-ubuntu-18.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
-      "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
@@ -88,24 +112,24 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true
     },
     {
@@ -113,35 +137,35 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -149,11 +173,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -172,16 +196,52 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     }
   ],
   "stable": [
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "UseInCI": true
+    },
     {
       "Channel": "stable",
       "ContinueOnError": false,
@@ -199,11 +259,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "ImageName": "ubuntu18.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
       "UseInCI": true
     },
     {
@@ -222,36 +282,24 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "arm32v7",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-arm32v7-ubuntu-bionic;7.2-arm32v7-ubuntu-18.04;arm32v7-ubuntu-bionic;arm32v7-ubuntu-18.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
-      "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
@@ -270,24 +318,24 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "UseInCI": true
     },
     {
@@ -295,35 +343,35 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-jammy-arm32;7.2-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -331,11 +379,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -354,12 +402,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -392,24 +440,12 @@
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": true
     },
     {
@@ -424,30 +460,6 @@
       "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
       "UseInCI": true
     },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
-      "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
-      "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "UseInCI": true
-    },
     {
       "Channel": "preview",
       "ContinueOnError": false,
@@ -489,11 +501,71 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
+      "IsLinux": true,
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -501,11 +573,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -525,11 +597,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     }
   ]

From 447e49807ac65aa927b2ac37dc8dfe2dce0348f4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Aug 2022 11:16:55 -0700
Subject: [PATCH 236/354] Add SU to mariner (#691)

* Update Dockerfile

* Update Dockerfile

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json
---
 release/7-2/alpine313/meta.json                  | 2 +-
 release/7-2/alpine314/meta.json                  | 2 +-
 release/7-2/mariner2/test-deps/docker/Dockerfile | 1 +
 release/7-3/alpine313/meta.json                  | 2 +-
 release/7-3/alpine314/meta.json                  | 2 +-
 release/7-3/mariner2/test-deps/docker/Dockerfile | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/release/7-2/alpine313/meta.json b/release/7-2/alpine313/meta.json
index 7fe8b9cd9..9b86fb096 100644
--- a/release/7-2/alpine313/meta.json
+++ b/release/7-2/alpine313/meta.json
@@ -13,7 +13,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 235
     },
     "EndOfLife": "2022-11-01",
     "DistributionState": "Validated"
diff --git a/release/7-2/alpine314/meta.json b/release/7-2/alpine314/meta.json
index 0f41a4eff..a3edd00b7 100644
--- a/release/7-2/alpine314/meta.json
+++ b/release/7-2/alpine314/meta.json
@@ -13,7 +13,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 235
     },
     "EndOfLife": "2023-05-01",
     "DistributionState": "Validated"
diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
index 9510b2984..b099b7844 100644
--- a/release/7-2/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-2/mariner2/test-deps/docker/Dockerfile
@@ -23,6 +23,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     mariner-repos-microsoft-preview \
     net-tools \
     tar \
+    util-linux \
     # clean cached data
     && tdnf clean all
 
diff --git a/release/7-3/alpine313/meta.json b/release/7-3/alpine313/meta.json
index 9858e00c9..8d6f4e2f1 100644
--- a/release/7-3/alpine313/meta.json
+++ b/release/7-3/alpine313/meta.json
@@ -10,7 +10,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 232
     },
     "EndOfLife": "2022-11-01",
     "DistributionState": "Validated",
diff --git a/release/7-3/alpine314/meta.json b/release/7-3/alpine314/meta.json
index 9d258f41f..ddddb75bb 100644
--- a/release/7-3/alpine314/meta.json
+++ b/release/7-3/alpine314/meta.json
@@ -10,7 +10,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 232
     },
     "EndOfLife": "2023-05-01",
     "DistributionState": "Validated",
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
index 7b595e1f5..8cdf20681 100644
--- a/release/7-3/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-3/mariner2/test-deps/docker/Dockerfile
@@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     mariner-repos-microsoft-preview \
     net-tools \
     tar \
+    util-linux \
     # clean cached data
     && tdnf clean all
 

From 1e8078c1a62e46bc0be1568b9079f1250ceb4c45 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 3 Aug 2022 14:35:02 -0400
Subject: [PATCH 237/354] mark arm images and alpine images as not to be used
 in CI (#690)

---
 release/7-2/alpine313/meta.json           | 3 ++-
 release/7-2/alpine314/meta.json           | 3 ++-
 release/7-2/ubuntu18.04-arm32v7/meta.json | 3 ++-
 release/7-2/ubuntu20.04-arm32v7/meta.json | 3 ++-
 release/7-2/ubuntu22.04-arm32v7/meta.json | 3 ++-
 release/7-3/ubuntu20.04-arm32v7/meta.json | 3 ++-
 release/7-3/ubuntu22.04-arm32v7/meta.json | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/release/7-2/alpine313/meta.json b/release/7-2/alpine313/meta.json
index 9b86fb096..e7120874d 100644
--- a/release/7-2/alpine313/meta.json
+++ b/release/7-2/alpine313/meta.json
@@ -16,5 +16,6 @@
         "size": 235
     },
     "EndOfLife": "2022-11-01",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-2/alpine314/meta.json b/release/7-2/alpine314/meta.json
index a3edd00b7..de159120c 100644
--- a/release/7-2/alpine314/meta.json
+++ b/release/7-2/alpine314/meta.json
@@ -16,5 +16,6 @@
         "size": 235
     },
     "EndOfLife": "2023-05-01",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
index 13c4bac50..56ee91d99 100644
--- a/release/7-2/ubuntu18.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu18.04-arm32v7/meta.json
@@ -20,5 +20,6 @@
         "Arm32": true
     },
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-2/ubuntu20.04-arm32v7/meta.json b/release/7-2/ubuntu20.04-arm32v7/meta.json
index 230f47834..0fafa511e 100644
--- a/release/7-2/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu20.04-arm32v7/meta.json
@@ -20,5 +20,6 @@
         "Arm32": true
     },
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
index 3b9e536d2..9d77a13d1 100644
--- a/release/7-2/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -23,5 +23,6 @@
         "latest"
     ],
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
index d9948e578..d4fb71097 100644
--- a/release/7-3/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu20.04-arm32v7/meta.json
@@ -16,5 +16,6 @@
         "Arm32": true
     },
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
index 700806e37..9bc98ced4 100644
--- a/release/7-3/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -19,5 +19,6 @@
         "preview"
     ],
     "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
+    "DistributionState": "Validated",
+    "UseInCi": false
 }

From 782abcdb232c617faa95a0c0a4c9a1ce096a4a17 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:02:26 -0700
Subject: [PATCH 238/354] Update the matrix json (#692)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 474 ++++++++++++++++++++++-----------------------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 9aa1b3290..0c0d5d57f 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -3,25 +3,25 @@
     {
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
@@ -40,24 +40,12 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
@@ -70,30 +58,18 @@
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
       "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
-      "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "UseInCI": true
+      "UseInCI": false
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
@@ -112,37 +88,37 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
-      "UseInCI": true
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "UseInCI": false
     },
     {
       "Channel": "lts",
@@ -154,31 +130,31 @@
       "JobName": "ubuntu22.04_arm32v7",
       "OsVersion": "Ubuntu 22.04 ARM 32v7",
       "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
-      "UseInCI": true
+      "UseInCI": false
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
-      "UseInCI": true
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "UseInCI": false
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "UseInCI": true
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
+      "UseInCI": false
     },
     {
       "Channel": "lts",
@@ -192,6 +168,18 @@
       "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "UseInCI": true
+    },
     {
       "Channel": "lts",
       "ContinueOnError": false,
@@ -203,31 +191,43 @@
       "OsVersion": "Windows Server, LTSC 2022",
       "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "UseInCI": true
     }
   ],
   "stable": [
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
@@ -246,24 +246,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
@@ -276,30 +264,18 @@
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
       "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
-      "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "UseInCI": true
+      "UseInCI": false
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "UseInCI": true
     },
     {
@@ -318,37 +294,37 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "UseInCI": true
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
+      "UseInCI": false
     },
     {
       "Channel": "stable",
@@ -360,31 +336,31 @@
       "JobName": "ubuntu22.04_arm32v7",
       "OsVersion": "Ubuntu 22.04 ARM 32v7",
       "TagList": "7.2-ubuntu-jammy-arm32;7.2-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
-      "UseInCI": true
+      "UseInCI": false
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
-      "UseInCI": true
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "UseInCI": false
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "UseInCI": true
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
+      "UseInCI": false
     },
     {
       "Channel": "stable",
@@ -398,6 +374,18 @@
       "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "UseInCI": true
+    },
     {
       "Channel": "stable",
       "ContinueOnError": false,
@@ -409,33 +397,81 @@
       "OsVersion": "Windows Server, LTSC 2022",
       "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "UseInCI": true
     }
   ],
   "preview": [
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
+      "IsLinux": true,
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
+    },
     {
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
       "UseInCI": false
     },
     {
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
       "UseInCI": false
     },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "UseInCI": true
+    },
     {
       "Channel": "preview",
       "ContinueOnError": false,
@@ -446,7 +482,7 @@
       "JobName": "ubuntu22.04_arm32v7",
       "OsVersion": "Ubuntu 22.04 ARM 32v7",
       "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
-      "UseInCI": true
+      "UseInCI": false
     },
     {
       "Channel": "preview",
@@ -464,13 +500,25 @@
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "IsLinux": true,
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
     },
     {
       "Channel": "preview",
@@ -496,54 +544,6 @@
       "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
-      "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
-      "UseInCI": true
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
-      "UseInCI": true
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
-      "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
-    },
     {
       "Channel": "preview",
       "ContinueOnError": false,
@@ -561,11 +561,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
@@ -573,11 +573,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -585,11 +585,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -597,11 +597,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     }
   ]

From 337e5a8d6e075f41943ed48f8002cdf391e42449 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 11 Aug 2022 14:40:00 -0700
Subject: [PATCH 239/354] Temporarily disable ARM images because of broken
 infra (#693)

---
 release/{ => unstable}/7-2/ubuntu18.04-arm32v7/docker/Dockerfile | 0
 release/{ => unstable}/7-2/ubuntu18.04-arm32v7/meta.json         | 0
 release/{ => unstable}/7-2/ubuntu20.04-arm32v7/docker/Dockerfile | 0
 release/{ => unstable}/7-2/ubuntu20.04-arm32v7/meta.json         | 0
 release/{ => unstable}/7-2/ubuntu22.04-arm32v7/docker/Dockerfile | 0
 release/{ => unstable}/7-2/ubuntu22.04-arm32v7/meta.json         | 0
 release/{ => unstable}/7-3/ubuntu20.04-arm32v7/docker/Dockerfile | 0
 release/{ => unstable}/7-3/ubuntu20.04-arm32v7/meta.json         | 0
 release/{ => unstable}/7-3/ubuntu22.04-arm32v7/docker/Dockerfile | 0
 release/{ => unstable}/7-3/ubuntu22.04-arm32v7/meta.json         | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename release/{ => unstable}/7-2/ubuntu18.04-arm32v7/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-2/ubuntu18.04-arm32v7/meta.json (100%)
 rename release/{ => unstable}/7-2/ubuntu20.04-arm32v7/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-2/ubuntu20.04-arm32v7/meta.json (100%)
 rename release/{ => unstable}/7-2/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-2/ubuntu22.04-arm32v7/meta.json (100%)
 rename release/{ => unstable}/7-3/ubuntu20.04-arm32v7/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-3/ubuntu20.04-arm32v7/meta.json (100%)
 rename release/{ => unstable}/7-3/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-3/ubuntu22.04-arm32v7/meta.json (100%)

diff --git a/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile b/release/unstable/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
rename to release/unstable/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/unstable/7-2/ubuntu18.04-arm32v7/meta.json
similarity index 100%
rename from release/7-2/ubuntu18.04-arm32v7/meta.json
rename to release/unstable/7-2/ubuntu18.04-arm32v7/meta.json
diff --git a/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile b/release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
rename to release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
diff --git a/release/7-2/ubuntu20.04-arm32v7/meta.json b/release/unstable/7-2/ubuntu20.04-arm32v7/meta.json
similarity index 100%
rename from release/7-2/ubuntu20.04-arm32v7/meta.json
rename to release/unstable/7-2/ubuntu20.04-arm32v7/meta.json
diff --git a/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile b/release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/unstable/7-2/ubuntu22.04-arm32v7/meta.json
similarity index 100%
rename from release/7-2/ubuntu22.04-arm32v7/meta.json
rename to release/unstable/7-2/ubuntu22.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
rename to release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/unstable/7-3/ubuntu20.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/meta.json
rename to release/unstable/7-3/ubuntu20.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/unstable/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/unstable/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/unstable/7-3/ubuntu22.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/meta.json
rename to release/unstable/7-3/ubuntu22.04-arm32v7/meta.json

From cda35a52e066299b71dc9b1b9fd69ccdc6d8f270 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Aug 2022 13:11:57 -0700
Subject: [PATCH 240/354] Update the matrix json (#694)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 522 ++++++++++++++++++---------------------------
 1 file changed, 213 insertions(+), 309 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 0c0d5d57f..42b53c5e1 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,17 +1,5 @@
 {
   "lts": [
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
-      "UseInCI": true
-    },
     {
       "Channel": "lts",
       "ContinueOnError": false,
@@ -28,24 +16,24 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "UseInCI": false
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true
     },
     {
@@ -63,37 +51,13 @@
     {
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
       "UseInCI": true
     },
     {
@@ -112,49 +76,49 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
-      "UseInCI": false
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
-      "UseInCI": false
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
-      "UseInCI": false
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "UseInCI": true
     },
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
-      "UseInCI": false
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
     },
     {
       "Channel": "lts",
@@ -168,6 +132,18 @@
       "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "UseInCI": true
+    },
     {
       "Channel": "lts",
       "ContinueOnError": false,
@@ -191,71 +167,47 @@
       "OsVersion": "Windows Server, LTSC 2022",
       "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
-    },
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
-      "UseInCI": true
     }
   ],
-  "stable": [
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
-      "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
-      "UseInCI": true
-    },
+  "preview": [
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -263,229 +215,181 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
       "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi84",
+      "IsLinux": true,
+      "JobName": "ubi84",
+      "OsVersion": "Universal Base Image 8.4 (In Validation)",
+      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "UseInCI": true
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu22.04",
       "IsLinux": true,
       "JobName": "ubuntu22.04",
       "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
-      "UseInCI": false
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-jammy-arm32;7.2-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
-      "UseInCI": false
-    },
-    {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": false
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
-      "UseInCI": false
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver1809",
       "IsLinux": false,
       "JobName": "nanoserver1809",
       "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     }
   ],
-  "preview": [
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
-      "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
-    },
+  "stable": [
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
@@ -493,115 +397,115 @@
       "IsLinux": true,
       "JobName": "ubi84",
       "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "TagList": "7.2-ubi-8.4;ubi-8.4",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2032-04-01T00:00:00",
       "ImageName": "ubuntu22.04",
       "IsLinux": true,
       "JobName": "ubuntu22.04",
       "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "windowsservercore2022",
       "IsLinux": false,
       "JobName": "windowsservercore2022",
       "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     }
   ]

From adb2df5d106cf36103f610269432e4ef6b80c7cc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Aug 2022 13:18:56 -0700
Subject: [PATCH 241/354] Update the release build yaml with the latest
 versions (#695)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index bbcb62d25..3c3ff5c76 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.6'
+    default: 'v7.3.0-preview.7'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.5'
+    default: 'v7.2.6'
   - name: 'stableReleaseTag'
-    default: 'v7.2.5'
+    default: 'v7.2.6'
 
 resources:
 - repo: self

From 1f712c5b41d76ff16027b258af63a1a44232a3af Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 26 Aug 2022 11:43:54 -0700
Subject: [PATCH 242/354] Remove use of `chmod 777` (#696)

* Update Dockerfile

* Update Dockerfile
---
 release/unstable/archlinux/docker/Dockerfile | 3 ++-
 release/unstable/blackarch/docker/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/release/unstable/archlinux/docker/Dockerfile b/release/unstable/archlinux/docker/Dockerfile
index 4ddc8bb7c..d7f40550a 100644
--- a/release/unstable/archlinux/docker/Dockerfile
+++ b/release/unstable/archlinux/docker/Dockerfile
@@ -32,7 +32,8 @@ RUN \
     # clone the gss-ntlmssp package repository
     && git clone https://aur.archlinux.org/gss-ntlmssp.git \
     # change the cloned gss-ntlmssp package repository directory permission
-    && chmod 777 /tmp/gss-ntlmssp/ \
+    # DO NOT use 777
+    # && chmod 777 /tmp/gss-ntlmssp/ \
     # change current path to gss-ntlmssp package repository folder path
     && cd gss-ntlmssp \
     # utilise sudo to builduser in order to make the gss-ntlmssp package
diff --git a/release/unstable/blackarch/docker/Dockerfile b/release/unstable/blackarch/docker/Dockerfile
index 9af9cbe1a..bc352d27e 100644
--- a/release/unstable/blackarch/docker/Dockerfile
+++ b/release/unstable/blackarch/docker/Dockerfile
@@ -33,7 +33,8 @@ RUN \
     # clone the gss-ntlmssp package repository
     && git clone https://aur.archlinux.org/gss-ntlmssp.git \
     # change the cloned gss-ntlmssp package repository directory permission
-    && chmod 777 /tmp/gss-ntlmssp/ \
+    # DO NOT use 777
+    # && chmod 777 /tmp/gss-ntlmssp/ \
     # change current path to gss-ntlmssp package repository folder path
     && cd gss-ntlmssp \
     # utilise sudo to builduser in order to make the gss-ntlmssp package

From 361b57812949be56ce4e953ae1dd7a7142a33c5f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 1 Sep 2022 10:51:12 -0700
Subject: [PATCH 243/354] Upgrade ubi 9 images during build (#698)

* upgrade ubi 9 images during build

* Delete scan18.04.txt
---
 release/7-3/ubi9/docker/Dockerfile           | 2 +-
 release/7-3/ubi9/test-deps/docker/Dockerfile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
index 30d25ce10..7d74d21d5 100644
--- a/release/7-3/ubi9/docker/Dockerfile
+++ b/release/7-3/ubi9/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
     yum localinstall -y \
       /mnt/rpm/linux.rpm \
-    && yum upgrade-minimal -y --security \
+    && yum upgrade -y --security \
     && yum clean all
 # Define ENVs for Localization/Globalization
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-3/ubi9/test-deps/docker/Dockerfile
index 0265a46f1..56c4c6af4 100644
--- a/release/7-3/ubi9/test-deps/docker/Dockerfile
+++ b/release/7-3/ubi9/test-deps/docker/Dockerfile
@@ -13,6 +13,7 @@ RUN yum install -y \
         git \
         unzip \
     && yum clean all \
+    && yum upgrade -y --security \
     && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9

From d8160e36f9a0682278754f35818c6d8c161dc37c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 1 Sep 2022 11:01:13 -0700
Subject: [PATCH 244/354] Switch Ubi 8 to upgrade to the latest LTS (#697)

* switch Ubi 8 to upgrade to the latest LTS

* Update Dockerfile

* Update Dockerfile
---
 release/7-2/{ubi84 => ubi8}/docker/Dockerfile           | 7 ++++---
 release/7-2/{ubi84 => ubi8}/meta.json                   | 4 ++--
 release/7-2/{ubi84 => ubi8}/test-deps/docker/Dockerfile | 0
 release/7-2/{ubi84 => ubi8}/test-deps/meta.json         | 4 ++--
 release/7-3/{ubi84 => ubi8}/docker/Dockerfile           | 7 ++++---
 release/7-3/{ubi84 => ubi8}/meta.json                   | 4 ++--
 release/7-3/{ubi84 => ubi8}/test-deps/docker/Dockerfile | 0
 release/7-3/{ubi84 => ubi8}/test-deps/meta.json         | 4 ++--
 8 files changed, 16 insertions(+), 14 deletions(-)
 rename release/7-2/{ubi84 => ubi8}/docker/Dockerfile (90%)
 rename release/7-2/{ubi84 => ubi8}/meta.json (87%)
 rename release/7-2/{ubi84 => ubi8}/test-deps/docker/Dockerfile (100%)
 rename release/7-2/{ubi84 => ubi8}/test-deps/meta.json (84%)
 rename release/7-3/{ubi84 => ubi8}/docker/Dockerfile (91%)
 rename release/7-3/{ubi84 => ubi8}/meta.json (84%)
 rename release/7-3/{ubi84 => ubi8}/test-deps/docker/Dockerfile (100%)
 rename release/7-3/{ubi84 => ubi8}/test-deps/meta.json (83%)

diff --git a/release/7-2/ubi84/docker/Dockerfile b/release/7-2/ubi8/docker/Dockerfile
similarity index 90%
rename from release/7-2/ubi84/docker/Dockerfile
rename to release/7-2/ubi8/docker/Dockerfile
index 2c57b4a95..152b43e67 100644
--- a/release/7-2/ubi84/docker/Dockerfile
+++ b/release/7-2/ubi8/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.2
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.4 AS installer-env
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
 ARG PS_VERSION=7.2.2
 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
@@ -10,7 +10,7 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.4 AS final-image
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
 ARG PS_VERSION=7.2.2
 ARG PS_INSTALL_VERSION=7
 
@@ -27,7 +27,8 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
     yum localinstall -y \
       /mnt/rpm/linux.rpm \
-    && yum upgrade-minimal -y --security \
+    # ubi 8 security updates are not marked as security updates.
+    && yum upgrade -y \
     && yum clean all
 # Define ENVs for Localization/Globalization
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
diff --git a/release/7-2/ubi84/meta.json b/release/7-2/ubi8/meta.json
similarity index 87%
rename from release/7-2/ubi84/meta.json
rename to release/7-2/ubi8/meta.json
index 1a9b73de9..aa635e425 100644
--- a/release/7-2/ubi84/meta.json
+++ b/release/7-2/ubi8/meta.json
@@ -3,13 +3,13 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8.4",
+    "osVersion": "Universal Base Image 8",
     "tagTemplates": [
         "#psversion#-ubi-#shorttag#",
         "ubi-#shorttag#"
     ],
     "shortTags": [
-        {"Tag": "8.4"}
+        {"Tag": "8"}
     ],
     "manifestLists": [
         "ubi"
diff --git a/release/7-2/ubi84/test-deps/docker/Dockerfile b/release/7-2/ubi8/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-2/ubi84/test-deps/docker/Dockerfile
rename to release/7-2/ubi8/test-deps/docker/Dockerfile
diff --git a/release/7-2/ubi84/test-deps/meta.json b/release/7-2/ubi8/test-deps/meta.json
similarity index 84%
rename from release/7-2/ubi84/test-deps/meta.json
rename to release/7-2/ubi8/test-deps/meta.json
index 7818d9d3b..1c069c038 100644
--- a/release/7-2/ubi84/test-deps/meta.json
+++ b/release/7-2/ubi8/test-deps/meta.json
@@ -1,10 +1,10 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8.4",
+    "osVersion": "Universal Base Image 8",
     "SkipGssNtlmSspTests": true,
     "shortTags": [
-        {"Tag": "8.4"}
+        {"Tag": "8"}
     ],
     "tagTemplates": [
         "#psversion#-ubi-#shorttag#",
diff --git a/release/7-3/ubi84/docker/Dockerfile b/release/7-3/ubi8/docker/Dockerfile
similarity index 91%
rename from release/7-3/ubi84/docker/Dockerfile
rename to release/7-3/ubi8/docker/Dockerfile
index 38542412c..e043f5d09 100644
--- a/release/7-3/ubi84/docker/Dockerfile
+++ b/release/7-3/ubi8/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.2
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.4 AS installer-env
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
 ARG PS_VERSION=7.3.0-preview.1
 ARG PACKAGE_VERSION=7.3.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
@@ -11,7 +11,7 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 # create folder at install location
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.4 AS final-image
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
 ARG PS_VERSION=7.3.0-preview.1
 ARG PS_INSTALL_VERSION=7-preview
 
@@ -28,7 +28,8 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
     yum localinstall -y \
       /mnt/rpm/linux.rpm \
-    && yum upgrade-minimal -y --security \
+    # ubi 8 security updates are not marked as security updates.
+    && yum upgrade -y \
     && yum clean all
 # Define ENVs for Localization/Globalization
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
diff --git a/release/7-3/ubi84/meta.json b/release/7-3/ubi8/meta.json
similarity index 84%
rename from release/7-3/ubi84/meta.json
rename to release/7-3/ubi8/meta.json
index 85a66b0fa..a99f29fe0 100644
--- a/release/7-3/ubi84/meta.json
+++ b/release/7-3/ubi8/meta.json
@@ -3,10 +3,10 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
     "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8.4",
+    "osVersion": "Universal Base Image 8",
     "ShortDistroName": "ubi",
     "shortTags": [
-        {"Tag": "8.4"}
+        {"Tag": "8"}
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/7-3/ubi84/test-deps/docker/Dockerfile b/release/7-3/ubi8/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi84/test-deps/docker/Dockerfile
rename to release/7-3/ubi8/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubi84/test-deps/meta.json b/release/7-3/ubi8/test-deps/meta.json
similarity index 83%
rename from release/7-3/ubi84/test-deps/meta.json
rename to release/7-3/ubi8/test-deps/meta.json
index e6da04678..590284827 100644
--- a/release/7-3/ubi84/test-deps/meta.json
+++ b/release/7-3/ubi8/test-deps/meta.json
@@ -1,10 +1,10 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8.4",
+    "osVersion": "Universal Base Image 8",
     "SkipGssNtlmSspTests": true,
     "shortTags": [
-        {"Tag": "8.4"}
+        {"Tag": "8"}
     ],
     "tagTemplates": [
         "ubi-#shorttag#"

From 3ad379c5e68ac76ddbbb7a5d759fa2e57cd506b3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 12:35:07 -0700
Subject: [PATCH 245/354] Update the matrix json (#699)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 484 ++++++++++++++++++++++-----------------------
 1 file changed, 242 insertions(+), 242 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 42b53c5e1..7d6178c99 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,43 +1,31 @@
 {
-  "lts": [
-    {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
-      "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "UseInCI": true
-    },
+  "preview": [
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
       "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -45,169 +33,181 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
       "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "lts-7.2-ubi-8.4;lts-ubi-8.4",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
-    }
-  ],
-  "preview": [
+    },
     {
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "UseInCI": true
+    }
+  ],
+  "lts": [
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -215,127 +215,127 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "preview-7.3-ubi-8.4;preview-ubi-8.4",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "windowsserver2022",
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "UseInCI": true
+    },
+    {
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     }
   ],
@@ -344,36 +344,36 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": false
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
@@ -391,73 +391,85 @@
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi84",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi84",
-      "OsVersion": "Universal Base Image 8.4 (In Validation)",
-      "TagList": "7.2-ubi-8.4;ubi-8.4",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "UseInCI": false
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "7.2-ubi-8;ubi-8",
       "UseInCI": true
     },
     {
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -477,11 +489,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -495,18 +507,6 @@
       "OsVersion": "Nano Server, version 1809",
       "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
-      "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "UseInCI": true
     }
   ]
 }

From 73a7d030cc839112932de278190168c4edbb486c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Sep 2022 14:40:13 -0700
Subject: [PATCH 246/354] update docker host detection (#704)

---
 tests/containerTestCommon.psm1 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 29b451415..aa900e8e0 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -210,25 +210,25 @@ function Test-SkipLinux
 
     $os = Get-DockerEngineOs
 
-    switch -wildcard ($os)
+    switch -RegEx ($os)
     {
-        '*Linux*' {
+        'Linux' {
             return $false
         }
-        '*Mac' {
+        '.*Mac' {
             return $false
         }
-        'Ubuntu*' {
+        '^Ubuntu.*' {
             return $false
         }
         # Docker for Windows means we are running the linux kernel
-        'Docker for Windows' {
+        '^Docker for Windows' {
             return $false
         }
-        'Windows*' {
+        '^(Microsoft )?Windows.*' {
             return $true
         }
-        'Docker Desktop' {
+        '^Docker Desktop' {
             return $false
         }
         default {

From ed4600216c6a9c841418b928acfc79325090e4db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 12:09:33 -0700
Subject: [PATCH 247/354] Update the release build yaml with the latest
 versions (#705)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3c3ff5c76..112166790 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.7'
+    default: 'v7.3.0-preview.8'
   - name: 'ltsReleaseTag'
     default: 'v7.2.6'
   - name: 'stableReleaseTag'

From df5f79b1d1b88845e9e583405f27042a72141915 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 6 Oct 2022 10:41:02 -0700
Subject: [PATCH 248/354] Use alpine node package (#709)

* alpine fixes

* Fix tests

* Mark size test as pending
---
 release/7-2/alpine313/docker/Dockerfile       |  2 ++
 .../7-2/alpine313/test-deps/docker/Dockerfile | 11 +++-----
 release/7-2/alpine314/docker/Dockerfile       |  2 ++
 .../7-2/alpine314/test-deps/docker/Dockerfile | 25 ++++++++-----------
 release/7-3/alpine313/docker/Dockerfile       |  2 ++
 .../7-3/alpine313/test-deps/docker/Dockerfile | 11 +++-----
 release/7-3/alpine314/docker/Dockerfile       |  2 ++
 .../7-3/alpine314/test-deps/docker/Dockerfile | 25 ++++++++-----------
 release/7-3/alpine315/docker/Dockerfile       |  2 ++
 .../7-3/alpine315/test-deps/docker/Dockerfile | 25 ++++++++-----------
 tests/container.tests.ps1                     |  4 +--
 11 files changed, 48 insertions(+), 63 deletions(-)

diff --git a/release/7-2/alpine313/docker/Dockerfile b/release/7-2/alpine313/docker/Dockerfile
index c70f8e53b..e2d479653 100644
--- a/release/7-2/alpine313/docker/Dockerfile
+++ b/release/7-2/alpine313/docker/Dockerfile
@@ -65,6 +65,8 @@ RUN apk add --no-cache \
     # PowerShell remoting over SSH dependencies
     openssh-client \
     \
+    && apk update \
+    && apk upgrade \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/7-2/alpine313/test-deps/docker/Dockerfile b/release/7-2/alpine313/test-deps/docker/Dockerfile
index fa53b84db..6f60dcef1 100644
--- a/release/7-2/alpine313/test-deps/docker/Dockerfile
+++ b/release/7-2/alpine313/test-deps/docker/Dockerfile
@@ -2,10 +2,6 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
 
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
 FROM ${BaseImage}
 
 ENV NODE_VERSION=14.17.6 \
@@ -16,10 +12,6 @@ ENV NODE_VERSION=14.17.6 \
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
 
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && apk add  --no-cache \
         bash \
@@ -29,6 +21,9 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
         curl \
         git \
         unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-2/alpine314/docker/Dockerfile b/release/7-2/alpine314/docker/Dockerfile
index e0a1d0596..f8313ae14 100644
--- a/release/7-2/alpine314/docker/Dockerfile
+++ b/release/7-2/alpine314/docker/Dockerfile
@@ -65,6 +65,8 @@ RUN apk add --no-cache \
   # PowerShell remoting over SSH dependencies
   openssh-client \
   \
+  && apk update \
+  && apk upgrade \
   # Create the pwsh symbolic link that points to powershell
   && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
   \
diff --git a/release/7-2/alpine314/test-deps/docker/Dockerfile b/release/7-2/alpine314/test-deps/docker/Dockerfile
index 5cdcf9e0b..ee54a8966 100644
--- a/release/7-2/alpine314/test-deps/docker/Dockerfile
+++ b/release/7-2/alpine314/test-deps/docker/Dockerfile
@@ -2,10 +2,6 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
 
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
 FROM ${BaseImage}
 
 ENV NODE_VERSION=14.17.6 \
@@ -16,19 +12,18 @@ ENV NODE_VERSION=14.17.6 \
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
 
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && apk add  --no-cache \
-    bash \
-    sudo \
-    shadow \
-    openssl \
-    curl \
-    git \
-    unzip \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-3/alpine313/docker/Dockerfile b/release/7-3/alpine313/docker/Dockerfile
index 9f7de89e0..345c491eb 100644
--- a/release/7-3/alpine313/docker/Dockerfile
+++ b/release/7-3/alpine313/docker/Dockerfile
@@ -65,6 +65,8 @@ RUN apk add --no-cache \
     # PowerShell remoting over SSH dependencies
     openssh-client \
     \
+    && apk update \
+    && apk upgrade \
     # Create the pwsh symbolic link that points to powershell
     && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
     \
diff --git a/release/7-3/alpine313/test-deps/docker/Dockerfile b/release/7-3/alpine313/test-deps/docker/Dockerfile
index 54468a34d..d34f657d0 100644
--- a/release/7-3/alpine313/test-deps/docker/Dockerfile
+++ b/release/7-3/alpine313/test-deps/docker/Dockerfile
@@ -2,10 +2,6 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
 
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
 FROM ${BaseImage}
 
 ENV NODE_VERSION=14.17.6 \
@@ -16,10 +12,6 @@ ENV NODE_VERSION=14.17.6 \
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
 
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && apk add --no-cache  \
         bash \
@@ -29,6 +21,9 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
         curl \
         git \
         unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
index 017f97961..a37bc2efb 100644
--- a/release/7-3/alpine314/docker/Dockerfile
+++ b/release/7-3/alpine314/docker/Dockerfile
@@ -65,6 +65,8 @@ RUN apk add --no-cache \
   # PowerShell remoting over SSH dependencies
   openssh-client \
   \
+  && apk update \
+  && apk upgrade \
   # Create the pwsh symbolic link that points to powershell
   && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
   \
diff --git a/release/7-3/alpine314/test-deps/docker/Dockerfile b/release/7-3/alpine314/test-deps/docker/Dockerfile
index d3d180bc6..f29f1d18d 100644
--- a/release/7-3/alpine314/test-deps/docker/Dockerfile
+++ b/release/7-3/alpine314/test-deps/docker/Dockerfile
@@ -2,10 +2,6 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
 
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
 FROM ${BaseImage}
 
 ENV NODE_VERSION=14.17.6 \
@@ -16,19 +12,18 @@ ENV NODE_VERSION=14.17.6 \
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
 
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && apk add --no-cache \
-    bash \
-    sudo \
-    shadow \
-    openssl \
-    curl \
-    git \
-    unzip \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
index 923dd37e8..33895a79a 100644
--- a/release/7-3/alpine315/docker/Dockerfile
+++ b/release/7-3/alpine315/docker/Dockerfile
@@ -65,6 +65,8 @@ RUN apk add --no-cache \
   # PowerShell remoting over SSH dependencies
   openssh-client \
   \
+  && apk update \
+  && apk upgrade \
   # Create the pwsh symbolic link that points to powershell
   && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
   \
diff --git a/release/7-3/alpine315/test-deps/docker/Dockerfile b/release/7-3/alpine315/test-deps/docker/Dockerfile
index e2acfa6af..2c846056b 100644
--- a/release/7-3/alpine315/test-deps/docker/Dockerfile
+++ b/release/7-3/alpine315/test-deps/docker/Dockerfile
@@ -2,10 +2,6 @@
 
 ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.15
 
-FROM node:14.17.6-alpine as node
-
-# Do nothing, just added to borrow the already built node files.
-
 FROM ${BaseImage}
 
 ENV NODE_VERSION=14.17.6 \
@@ -16,19 +12,18 @@ ENV NODE_VERSION=14.17.6 \
 # workaround for Alpine to run in Azure DevOps
 ENV NODE_NO_WARNINGS=1
 
-# Copy node and yarn into image
-COPY --from=node /usr/local/bin/node /usr/local/bin/node
-COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}
-
 RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
     && apk add --no-cache \
-    bash \
-    sudo \
-    shadow \
-    openssl \
-    curl \
-    git \
-    unzip \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
     && apk del .pipeline-deps \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
     && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index a6e2f82fe..60da876c9 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -505,7 +505,6 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             $muslCommands = @(
                 @{
                     command = 'node'
-                    path = '/usr/local/bin/node'
                 }
             )
 
@@ -581,7 +580,8 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             })
         }
 
-        it "Verify size of <name>" -TestCases $sizeTestCases  -Skip:$script:skipLinuxRun {
+        # -Skip:$script:skipLinuxRun
+        it "Verify size of <name>" -TestCases $sizeTestCases -Pending {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]

From e01bc352071debcdd98e5e5e0c181285bb6bba65 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 6 Oct 2022 12:30:19 -0700
Subject: [PATCH 249/354] Pin Windows release build image version (#703)

---
 .vsts-ci/releasePhase.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 729efe018..2f08e4e32 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -13,7 +13,8 @@ parameters:
     default: []
     type: object
   - name: matrix
-
+  - name: imageVersion
+    default: 'latest'
 jobs:
 - job: ${{ parameters.jobName }}
   dependsOn:
@@ -31,6 +32,9 @@ jobs:
     name: PowerShell1ES
     demands:
       - ImageOverride -equals ${{ parameters.vmImage }}
+      - ${{ if ne(parameters.imageVersion, 'latest') }}:
+        - ImageVersionOverride -equals ${{ parameters.imageVersion }}
+
 
   timeoutInMinutes: 135
 

From 262e26156e2a78a45823bcbb265f4b1ccbd79e63 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 7 Oct 2022 12:38:35 -0700
Subject: [PATCH 250/354] Use az.cmd in release build (#710)

---
 tests/containerTestCommon.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index aa900e8e0..017ed0b74 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -36,7 +36,7 @@ function Invoke-Docker
     $cliCommand = @()
     if($UseAcr)
     {
-        $cli = @('az')
+        $cli = @('az.cmd')
         $cliCommand += 'acr'
     }
     else {

From 6a175076528ba5a27b809888eb3227be1b7e06f3 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 14 Oct 2022 14:22:15 -0700
Subject: [PATCH 251/354] Add Arm image support in CI, but not release (#714)

* move ubuntu arm image back

* Add ARM build to CI

* Don't use ACR to build ARM

* try removing space

* use else

* update job names

* missed change

* fix for newer version of docker

* skip cg if nothing to run

* Fix ARM image

* Install .NET

* don't run publish in the pool

* Use .NET 6

* map to var

* disable cg on ARM

* add diagnostics

* renable Ubuntu 22 arm preview

* document host architecture json element

* renable stable arm images

* renable stable arm images

* update unit tests

* correct architecture

* Update stable Ubuntu 20 ARM

* update from tag

* Re-enable CG

* Revert "Re-enable CG"

This reverts commit 3daad26be31d16261d2a602367e13bb507bc6ca3.

* update release pipelines

* fix syntax issue

* disable arm64 releases

* fix release test
---
 .vsts-ci/phase.yml                            | 57 ++++++++++++---
 .vsts-ci/releasePhase.yml                     | 26 ++++++-
 .vsts-ci/releaseStage.yml                     | 18 +++--
 .vsts-ci/stage.yml                            | 16 +++--
 .../templatesReleasePipeline/releaseStage.yml | 17 +++--
 .../templatesReleasePipeline/testStage.yml    | 12 +++-
 build.ps1                                     | 32 ++++++---
 docs/development.md                           | 13 ++++
 .../7-2/ubuntu18.04-arm32v7/docker/Dockerfile |  0
 .../7-2/ubuntu18.04-arm32v7/meta.json         |  5 +-
 .../7-2/ubuntu20.04-arm32v7/docker/Dockerfile | 65 +++++++++++++++++
 .../7-2/ubuntu20.04-arm32v7/meta.json         |  5 +-
 .../7-2/ubuntu22.04-arm32v7/docker/Dockerfile | 70 +++++++++++++++++++
 .../7-2/ubuntu22.04-arm32v7/meta.json         |  5 +-
 .../7-3/ubuntu20.04-arm32v7/docker/Dockerfile | 63 +++++++++++++++++
 .../7-3/ubuntu20.04-arm32v7/meta.json         |  5 +-
 .../7-3/ubuntu22.04-arm32v7/docker/Dockerfile |  0
 .../7-3/ubuntu22.04-arm32v7/meta.json         |  5 +-
 .../7-2/ubuntu20.04-arm32v7/docker/Dockerfile | 70 -------------------
 .../7-2/ubuntu22.04-arm32v7/docker/Dockerfile | 70 -------------------
 .../7-3/ubuntu20.04-arm32v7/docker/Dockerfile | 59 ----------------
 tests/containerTestCommon.psm1                |  1 -
 tools/buildHelper/buildHelper.psm1            | 14 ++++
 unittests/generateMatrixJson.tests.ps1        |  2 +-
 24 files changed, 384 insertions(+), 246 deletions(-)
 rename release/{unstable => }/7-2/ubuntu18.04-arm32v7/docker/Dockerfile (100%)
 rename release/{unstable => }/7-2/ubuntu18.04-arm32v7/meta.json (89%)
 create mode 100644 release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
 rename release/{unstable => }/7-2/ubuntu20.04-arm32v7/meta.json (89%)
 create mode 100644 release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
 rename release/{unstable => }/7-2/ubuntu22.04-arm32v7/meta.json (90%)
 create mode 100644 release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
 rename release/{unstable => }/7-3/ubuntu20.04-arm32v7/meta.json (87%)
 rename release/{unstable => }/7-3/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{unstable => }/7-3/ubuntu22.04-arm32v7/meta.json (88%)
 delete mode 100644 release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
 delete mode 100644 release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
 delete mode 100644 release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index e79bf4752..846f64969 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -1,13 +1,24 @@
 parameters:
-  name: ''
-  vmImage: 'ubuntu-latest'
-  continueonerror: false
-  ciParameter: '-CI'
-  useacr: 'false'
-  matrix: ''
-  dependsOn: 'GenerateYaml'
-  jobName: 'Build'
-  maxParallel: 5
+  - name: name
+    default: ''
+  - name: vmImage
+    default: 'ubuntu-latest'
+  - name: pool
+    default: ''
+  - name: continueonerror
+    default: false
+  - name: ciParameter
+    default: '-CI'
+  - name: useacr
+    default: 'false'
+  - name: matrix
+    default: ''
+  - name: dependsOn
+    default: 'GenerateYaml'
+  - name: jobName
+    default: 'Build'
+  - name: maxParallel
+    default: 5
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -19,9 +30,16 @@ jobs:
   variables:
     ContinueOnError: ${{ parameters.continueonerror }}
     scanType: Register
+    pool: ${{ parameters.pool }}
 
   pool:
-    vmImage: ${{ parameters.vmImage }}
+    ${{ if eq(parameters['pool'],'')}}:
+      vmImage: ${{ parameters.vmImage }}
+    ${{ else }}:
+      name: ${{ parameters.pool }}
+      demands:
+        - ImageOverride -equals ${{ parameters.vmImage }}
+
   steps:
   - ${{ if eq(parameters.useacr, 'true') }}:
     - pwsh: |
@@ -29,6 +47,12 @@ jobs:
       displayName: 'Enable ACR'
       condition: ne(variables['ACR'], 'no')
 
+  - pwsh: |
+      Write-Verbose -verbose "pshome: $pshome"
+      $psversiontable
+    displayName: PowerShell Info
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=scanType;]LogOnly"
     displayName: Set scanType to LogOnly For PRs
@@ -67,6 +91,16 @@ jobs:
     displayName: 'Capture Docker* Environment Variables'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
+  - task: UseDotNet@2
+    inputs:
+      packageType: 'sdk'
+      version: 6.x
+
+  - pwsh: |
+      dotnet --list-sdks
+    displayName: dotnet info
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
   - task: ComponentGovernanceComponentDetection@0
     inputs:
       dockerImagesToScan: $(dockerImagesToScan)
@@ -75,6 +109,7 @@ jobs:
       alertWarningLevel: 'High'
       failOnAlert: true
     displayName: Component Governance - $(ImageName) $(Channel)
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],''))
 
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }
@@ -87,7 +122,7 @@ jobs:
     continueOnError: ${{ variables.continueonerror }}
 
   - task: PublishTestResults@2
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],''))
     displayName: Publish $(ImageName) Test Results **\test*.xml
     continueOnError: ${{ variables.continueonerror }}
 
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 2f08e4e32..6c851da78 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -13,8 +13,11 @@ parameters:
     default: []
     type: object
   - name: matrix
+  - name: pool
+    default: PowerShell1ES
   - name: imageVersion
     default: 'latest'
+
 jobs:
 - job: ${{ parameters.jobName }}
   dependsOn:
@@ -29,7 +32,7 @@ jobs:
     scanType: Register
 
   pool:
-    name: PowerShell1ES
+    name: ${{ parameters.pool }}
     demands:
       - ImageOverride -equals ${{ parameters.vmImage }}
       - ${{ if ne(parameters.imageVersion, 'latest') }}:
@@ -41,11 +44,30 @@ jobs:
   displayName: ${{ parameters.jobName }}
 
   steps:
+  - task: UseDotNet@2
+    inputs:
+      packageType: 'sdk'
+      version: 6.x
+
+  - pwsh: |
+      dotnet --list-sdks
+    displayName: dotnet info
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: |
+      if (!(get-Command -name 'az' -errorAction SilentlyContinue)) {
+        Write-Host "Installing Az CLI"
+        curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+      }
+    displayName: Install Azure CLI
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
   - task: DownloadBuildArtifacts@0
     displayName: 'Download Build Artifacts'
     inputs:
       downloadType: specific
       itemPattern: buildMeta/**/*.json
+
   - powershell: |
       $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
       if($json.Count -ge 1)
@@ -125,7 +147,7 @@ jobs:
       alertWarningLevel: 'High'
       failOnAlert: true
     displayName: Component Governance - $(ImageName) $(Channel)
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''), ne(variables['ACR'],'No'))
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],'PowerShell1ES'), ne(variables['ACR'],'No'))
 
   - pwsh: 'docker logout $(dockerHost)'
     displayName: 'docker logout'
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 3fa558cc1..5bd192f94 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -34,15 +34,25 @@ stages:
         condition: succeededOrFailed()
     - template: releasePhase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
         dependsOn:
           - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux
+        jobName: Build_Linux_x64
+
+    # - template: releasePhase.yml
+    #   parameters:
+    #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
+    #     dependsOn:
+    #       - GenerateYaml_${{ parameters.channel }}
+    #     jobName: Build_Linux_arm
+    #     pool: PS-mscodehub-ARM
+    #     vmImage: PSMMSUbuntu20.04-ARM64-secure
+
     - template: releasePhase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
         dependsOn:
           - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Win
+        jobName: Build_Win_x64
         vmImage: PSMMS2019-Secure
         ACR: yes
diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index 4782d3926..bb2e7b807 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -35,15 +35,23 @@ stages:
         condition: succeededOrFailed()
     - template: phase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
         dependsOn: GenerateYaml_${{ variables.jobName }}
-        jobName: Build_Linux
+        jobName: Build_Linux_x64
         useacr: ${{ parameters.useacr }}
     - template: phase.yml
       parameters:
-        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
         dependsOn: GenerateYaml_${{ variables.jobName }}
-        jobName: Build_Win
+        jobName: Build_Linux_ARM
+        useacr: ${{ parameters.useacr }}
+        pool: PS-PowerShell-ARM
+        vmImage: PSMMSUbuntu20.04-ARM64-secure
+    - template: phase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
+        dependsOn: GenerateYaml_${{ variables.jobName }}
+        jobName: Build_Win_x64
         vmImage: windows-2022
         ciParameter: ${{ parameters.winCiParameter }}
         useacr: ${{ parameters.useacr }}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index 9b1fb46d3..80a90b7a0 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -41,8 +41,8 @@ stages:
 
       - template: ./releaseJob.yml
         parameters:
-          jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+          jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}_x64
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
           WhatIf: ${{ parameters.WhatIf }}
           vmImage: "PSMMS2019-Secure"
           dependsOn:
@@ -50,13 +50,22 @@ stages:
 
       - template: ./releaseJob.yml
         parameters:
-          jobName: ${{ parameters.channel }}_linux
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+          jobName: ${{ parameters.channel }}_linux_x64
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
           WhatIf: ${{ parameters.WhatIf }}
           vmImage: "PSMMSUbuntu20.04-Secure"
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
+      # - template: ./releaseJob.yml
+      #   parameters:
+      #     jobName: ${{ parameters.channel }}_linux_arm
+      #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
+      #     WhatIf: ${{ parameters.WhatIf }}
+      #     vmImage: "PSMMSUbuntu20.04-Secure"
+      #     dependsOn:
+      #       - GenerateYaml_${{ parameters.channel }}
+
     - stage: Release_ManifestList_${{ parameters.channel }}
       jobs:
       - template: ./releaseManifestList.yml
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index d5fff6af2..291dae232 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -37,7 +37,7 @@ stages:
       - template: ./testJob.yml
         parameters:
           jobName: ${{ parameters.channel }}_windows
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows']
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
           vmImage: windows-latest
           tagfilter: 1809
           dependsOn:
@@ -46,7 +46,15 @@ stages:
       - template: ./testJob.yml
         parameters:
           jobName: ${{ parameters.channel }}_linux
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux']
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
           vmImage: ubuntu-latest
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
+
+      # - template: ./testJob.yml
+      #   parameters:
+      #     jobName: ${{ parameters.channel }}_linux
+      #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
+      #     vmImage: ubuntu-latest
+      #     dependsOn:
+      #       - GenerateYaml_${{ parameters.channel }}
diff --git a/build.ps1 b/build.ps1
index e186e441f..d72484107 100755
--- a/build.ps1
+++ b/build.ps1
@@ -429,7 +429,7 @@ End {
                     continue
                 }
 
-                $architecture = 'amd64'
+                $architecture = $allMeta.meta.Architecture
                 $imagePath = $allMeta.imagePath
                 $relativeImagePath = $imagePath.Replace($PSScriptRoot,'')
                 $relativeImagePath = $relativeImagePath -replace '\\', '/'
@@ -596,9 +596,12 @@ End {
                 $osGroups = $channelGroup.Group | Group-Object -Property os
                 foreach ($osGroup in $osGroups) {
                     $osName = $osGroup.Name
+                    $architectureGroups = $osGroup.Group | Group-Object -Property Architecture
+                    foreach ($architectureGroup in $architectureGroups) {
+                        $architectureName = $architectureGroup.Name
 
                     # Filter out subimages.  We cannot directly build subimages.
-                    foreach ($tag in $osGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property dockerfile) {
+                        foreach ($tag in $architectureGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property dockerfile) {
                         if (-not $matrix.ContainsKey($channelName)) {
                             $matrix.Add($channelName, @{ })
                         }
@@ -607,9 +610,13 @@ End {
                             $matrix.$channelName.Add($osName, @{ })
                         }
 
+                            if (-not $matrix.$channelName.$osName.ContainsKey($architectureName)) {
+                                $matrix.$channelName.$osName.Add($architectureName, @{})
+                            }
+
                         $jobName = $tag.Name -replace '-', '_'
-                        if (-not $matrix.$channelName[$osName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
-                            $matrix.$channelName[$osName].Add($jobName, (ConvertTo-SortedDictionary -Hashtable @{
+                            if (-not $matrix.$channelName[$osName][$architectureName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
+                                $matrix.$channelName[$osName][$architectureName].Add($jobName, (ConvertTo-SortedDictionary -Hashtable @{
                                     Channel           = $tag.Channel
                                     ImageName         = $tag.Name
                                     JobName           = $jobName
@@ -621,7 +628,11 @@ End {
                                     TagList           = $tag.Tags -join ';'
                                     IsLinux           = $tag.IsLinux
                                     UseInCI           = $tag.UseInCI
-                                }))
+                                            Architecture      = $tag.Architecture
+                                        }
+                                    )
+                                )
+                            }
                         }
                     }
                 }
@@ -632,15 +643,20 @@ End {
             $fullMatrix[$channelName] = @()
             foreach ($osName in $matrix.$channelName.Keys | Sort-Object) {
                 $osMatrix = $matrix.$channelName.$osName
+                foreach ($architectureName in $osMatrix.Keys | Sort-Object) {
+                    $architectureMatrix = $osMatrix.$architectureName
+
                 $channelMatrix = [System.Collections.ArrayList]::new()
-                $osMatrix.Values | Sort-Object -Property ImageName | ForEach-Object {
+                    $architectureMatrix.Values | Sort-Object -Property ImageName | ForEach-Object {
                     $null = $channelMatrix.Add($_)
                 }
                 $fullMatrix[$channelName] += $channelMatrix
-                $matrixJson = $osMatrix | ConvertTo-Json -Compress
-                $variableName = "matrix_${channelName}_${osName}"
+                    $matrixJson = $architectureMatrix | ConvertTo-Json -Compress
+                    $variableName = "matrix_${channelName}_${osName}_${architectureName}"
                 if (!$FullJson) {
                     Set-BuildVariable -Name $variableName -Value $matrixJson -IsOutput
+                        Write-Verbose -Verbose "*********END of JSON*********************"
+                    }
                 }
             }
         }
diff --git a/docs/development.md b/docs/development.md
index c4492e252..52532e723 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -153,6 +153,19 @@ This file *is **required*** for all containers. Here is the bare minimum:
 }
 ```
 
+### Host architecture
+
+You can specify the host architecture.
+Currently, `amd64` is supported everywhere and
+`arm64` is supported on Linux.
+Linux `arm64` can build both `arm32` and `arm64`.
+
+```json
+{
+    "Architecture" : "amd64"
+}
+```
+
 You should also add [tags](#tags) as a field.
 
 ## Dependabot
diff --git a/release/unstable/7-2/ubuntu18.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/unstable/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
rename to release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
diff --git a/release/unstable/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
similarity index 89%
rename from release/unstable/7-2/ubuntu18.04-arm32v7/meta.json
rename to release/7-2/ubuntu18.04-arm32v7/meta.json
index 56ee91d99..4c8c51885 100644
--- a/release/unstable/7-2/ubuntu18.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu18.04-arm32v7/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
-    "UseAcr": true,
+    "UseAcr": false,
     "tagTemplates": [
         "#psversion#-ubuntu-#shorttag#-arm32",
         "ubuntu-#shorttag#-arm32"
@@ -21,5 +21,6 @@
     },
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
-    "UseInCi": false
+    "UseInCi": false,
+    "Architecture": "arm64"
 }
diff --git a/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..2fc43adda
--- /dev/null
+++ b/release/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,65 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+
+    ARG PS_VERSION=7.2.3
+    ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+    ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # define the folder we will be installing PowerShell to
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+    # Create the install folder
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+    ARG PS_PACKAGE_URL_BASE64
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates wget --yes
+    RUN update-ca-certificates -f
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+    RUN ls -l /tmp/powershell.tar.gz
+        # Unzip the Linux tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7
+    ARG PS_VERSION=7.2.3
+
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates libssl1.1 libicu66 less --yes
+
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/unstable/7-2/ubuntu20.04-arm32v7/meta.json b/release/7-2/ubuntu20.04-arm32v7/meta.json
similarity index 89%
rename from release/unstable/7-2/ubuntu20.04-arm32v7/meta.json
rename to release/7-2/ubuntu20.04-arm32v7/meta.json
index 0fafa511e..c5e9cc22b 100644
--- a/release/unstable/7-2/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu20.04-arm32v7/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
-    "UseAcr": true,
+    "UseAcr": false,
     "tagTemplates": [
         "#psversion#-ubuntu-#shorttag#-arm32",
         "ubuntu-#shorttag#-arm32"
@@ -21,5 +21,6 @@
     },
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
-    "UseInCi": false
+    "UseInCi": false,
+    "Architecture": "arm64"
 }
diff --git a/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..36ac43947
--- /dev/null
+++ b/release/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,70 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
+
+    ARG PS_VERSION=7.2.4
+    ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+    ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # define the folder we will be installing PowerShell to
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+    # Create the install folder
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+    ARG PS_PACKAGE_URL_BASE64
+
+    RUN apt-get update \
+        && apt-get install --no-install-recommends ca-certificates wget --yes
+
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+
+    RUN ls -l /tmp/powershell.tar.gz
+
+        # Unzip the Linux tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:jammy AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7
+    ARG PS_VERSION=7.2.4
+
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
+
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+
+    RUN \
+    apt-get update \
+    && apt-get install --no-install-recommends ca-certificates libunwind8 libssl3 libicu70 less --yes
+
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/unstable/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
similarity index 90%
rename from release/unstable/7-2/ubuntu22.04-arm32v7/meta.json
rename to release/7-2/ubuntu22.04-arm32v7/meta.json
index 9d77a13d1..8d2fd1f7c 100644
--- a/release/unstable/7-2/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
-    "UseAcr": true,
+    "UseAcr": false,
     "tagTemplates": [
         "#psversion#-ubuntu-#shorttag#-arm32",
         "ubuntu-#shorttag#-arm32"
@@ -24,5 +24,6 @@
     ],
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
-    "UseInCi": false
+    "UseInCi": false,
+    "Architecture": "arm64"
 }
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..a871986d9
--- /dev/null
+++ b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,63 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+    ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+    # define the folder we will be installing PowerShell to
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+    # Create the install folder
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+    ARG PS_PACKAGE_URL_BASE64
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates wget --yes
+    RUN update-ca-certificates -f
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+    RUN ls -l /tmp/powershell.tar.gz
+        # Unzip the Linux tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates libssl1.1 libicu66 less --yes
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+        # Create the pwsh-preview symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/unstable/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
similarity index 87%
rename from release/unstable/7-3/ubuntu20.04-arm32v7/meta.json
rename to release/7-3/ubuntu20.04-arm32v7/meta.json
index d4fb71097..204e9e8e4 100644
--- a/release/unstable/7-3/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu20.04-arm32v7/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
-    "UseAcr": true,
+    "UseAcr": false,
     "shortTags": [
         {"Tag": "focal-arm32"},
         {"Tag": "20.04-arm32"}
@@ -17,5 +17,6 @@
     },
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
-    "UseInCi": false
+    "UseInCi": false,
+    "Architecture": "arm64"
 }
diff --git a/release/unstable/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/unstable/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/unstable/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
similarity index 88%
rename from release/unstable/7-3/ubuntu22.04-arm32v7/meta.json
rename to release/7-3/ubuntu22.04-arm32v7/meta.json
index 9bc98ced4..4f1fffcf0 100644
--- a/release/unstable/7-3/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -6,7 +6,7 @@
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "ubuntu",
     "Base64EncodePackageUrl": true,
-    "UseAcr": true,
+    "UseAcr": false,
     "shortTags": [
         {"Tag": "jammy-arm32"},
         {"Tag": "22.04-arm32"}
@@ -20,5 +20,6 @@
     ],
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
-    "UseInCi": false
+    "UseInCi": false,
+    "Architecture": "arm64"
 }
diff --git a/release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile b/release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
deleted file mode 100644
index 21656372d..000000000
--- a/release/unstable/7-2/ubuntu20.04-arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
-
-ARG PS_VERSION=7.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=7.2.3
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile b/release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
deleted file mode 100644
index 881942e99..000000000
--- a/release/unstable/7-2/ubuntu22.04-arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
-
-ARG PS_VERSION=7.2.4
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=7.2.4
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl3 libicu70 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
deleted file mode 100644
index 5a66df083..000000000
--- a/release/unstable/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
-
-ARG PS_VERSION=7.3.0-preview.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-ARG PS_PACKAGE_URL_BASE64
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-RUN ls -l /tmp/powershell.tar.gz
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ARG PS_VERSION=7.3.0-preview.3
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libssl1.0 libicu60 less --yes
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 017ed0b74..71ccd29f8 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -519,7 +519,6 @@ function Invoke-DockerBuild
             $buildArgList += '--pull'
         }
 
-        $buildArgList += '--quiet'
         $buildArgList += '--progress=plain'
     }
 
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index d19c74dc3..d24c8d49e 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -99,6 +99,17 @@ function Get-ChannelPath
     return Join-Path -Path $resolvedRepoRoot -ChildPath $relativePath
 }
 
+function Get-ChannelEndOfLife {
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $Channel
+    )
+
+    $endOfLife = $channelData | Where-Object { $_.Name -eq $Channel } | Select-Object -ExpandProperty EndOfLife -First 1
+    return $endOfLife
+}
+
 function Get-ChannelPackageTag
 {
     param(
@@ -246,6 +257,9 @@ class DockerImageMetaData {
     [bool]
     $UseAcr = $false
 
+    [string]
+    $Architecture = 'amd64'
+
     [bool]
     $IsBroken = $false
 
diff --git a/unittests/generateMatrixJson.tests.ps1 b/unittests/generateMatrixJson.tests.ps1
index eeb61a9e0..8b27ed81c 100644
--- a/unittests/generateMatrixJson.tests.ps1
+++ b/unittests/generateMatrixJson.tests.ps1
@@ -43,7 +43,7 @@ Describe "build.ps1 -GenerateMatrixJson" {
                 $json = $vstsVariable.Value
                 { $script:matrix += $json | ConvertFrom-Json -AsHashtable } | should -not -Throw
             }
-            $script:matrix.count | Should -Be 2
+            $script:matrix.count | Should -Be 3
         }
         It "Should have multiple images" {
             foreach($platforMatrix in $Script:matrix) {

From a712a344bdbc4999e3fec803c48b2d2244c2f806 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 16:37:06 -0700
Subject: [PATCH 252/354] Update the matrix json (#713)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 530 ++++++++++++++++++++++-----------------------
 1 file changed, 265 insertions(+), 265 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 7d6178c99..1457c33e7 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,55 +1,55 @@
 {
-  "preview": [
+  "stable": [
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "7.2-ubi-8;ubi-8",
+      "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -57,181 +57,169 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "UseInCI": true
+    },
+    {
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
       "ImageName": "mariner2",
       "IsLinux": true,
       "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-06-01T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "UseInCI": false
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
-      "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "windowsservercore2022",
       "IsLinux": false,
       "JobName": "windowsservercore2022",
       "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
-      "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     }
   ],
-  "lts": [
+  "preview": [
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
       "UseInCI": false
     },
     {
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "UseInCI": true
-    },
-    {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -239,193 +227,217 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
       "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
-      "UseInCI": true
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "windowsservercore2022",
       "IsLinux": false,
       "JobName": "windowsservercore2022",
       "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
-    },
+    }
+  ],
+  "lts": [
     {
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
-    }
-  ],
-  "stable": [
+    },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
-      "UseInCI": false
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-06-01T00:00:00",
@@ -433,47 +445,47 @@
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "7.2-ubi-8;ubi-8",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -481,31 +493,19 @@
       "IsLinux": false,
       "JobName": "windowsservercore2022",
       "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
-      "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     }
   ]

From 12b881cd5bc7e8c008290329024a7437bafac3c1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 11:18:03 -0700
Subject: [PATCH 253/354] Update the matrix json (#715)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 assets/matrix.json | 626 ++++++++++++++++++++++++++++-----------------
 1 file changed, 386 insertions(+), 240 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 1457c33e7..124429925 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,55 +1,21 @@
 {
-  "stable": [
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
-      "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
-      "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "7.2-ubi-8;ubi-8",
-      "UseInCI": true
-    },
+  "preview": [
     {
-      "Channel": "stable",
+      "Architecture": "amd64",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "UseInCI": true
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Channel": "stable",
+      "Architecture": "amd64",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2022-11-01T00:00:00",
@@ -57,23 +23,12 @@
       "IsLinux": true,
       "JobName": "alpine313",
       "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
       "UseInCI": false
     },
     {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
-      "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
+      "Architecture": "amd64",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
@@ -81,108 +36,37 @@
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Architecture": "amd64",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "stable",
+      "Architecture": "amd64",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "debian10",
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
-      "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "UseInCI": false
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
-      "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
-      "UseInCI": true
-    },
-    {
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
-      "UseInCI": true
-    }
-  ],
-  "preview": [
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
-      "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -195,18 +79,20 @@
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
+      "DistributionState": "ImageCreation",
       "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validating",
@@ -219,18 +105,20 @@
       "UseInCI": false
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
       "UseInCI": false
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -243,54 +131,33 @@
       "UseInCI": true
     },
     {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
-      "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
-      "UseInCI": true
-    },
-    {
+      "Architecture": "arm64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
+      "Architecture": "arm64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
-      "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "UseInCI": true
-    },
-    {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -303,18 +170,7 @@
       "UseInCI": true
     },
     {
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
-      "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
-      "UseInCI": true
-    },
-    {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -327,6 +183,7 @@
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -337,10 +194,24 @@
       "OsVersion": "Nano Server, LTSC 2022",
       "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
+      "IsLinux": false,
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "UseInCI": true
     }
   ],
   "lts": [
     {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -353,22 +224,37 @@
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "UseInCI": false
     },
     {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
+      "IsLinux": true,
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
       "ImageName": "ubi8",
       "IsLinux": true,
       "JobName": "ubi8",
@@ -377,6 +263,33 @@
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -389,18 +302,33 @@
       "UseInCI": true
     },
     {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
+      "IsLinux": true,
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "UseInCI": false
     },
     {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -413,31 +341,153 @@
       "UseInCI": true
     },
     {
+      "Architecture": "arm64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
+      "IsLinux": false,
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "nanoserver2022",
+      "IsLinux": false,
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
+      "IsLinux": false,
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "UseInCI": true
+    }
+  ],
+  "stable": [
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2022-11-01T00:00:00",
+      "ImageName": "alpine313",
+      "IsLinux": true,
+      "JobName": "alpine313",
+      "OsVersion": "Alpine 3.13",
+      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
       "ImageName": "mariner2",
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "TagList": "7.2-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "7.2-ubi-8;ubi-8",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-06-01T00:00:00",
@@ -445,11 +495,51 @@
       "IsLinux": true,
       "JobName": "debian10",
       "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-06-30T00:00:00",
+      "ImageName": "debian9",
+      "IsLinux": true,
+      "JobName": "debian9",
+      "OsVersion": "Debian 9 (End of Life)",
+      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-05-01T00:00:00",
@@ -457,35 +547,77 @@
       "IsLinux": true,
       "JobName": "alpine314",
       "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "TagList": "7.2-alpine-3.14;alpine-3.14",
       "UseInCI": false
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
+      "IsLinux": true,
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "arm64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu22.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "7.2-ubuntu-jammy-arm32;7.2-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -493,11 +625,12 @@
       "IsLinux": false,
       "JobName": "windowsservercore2022",
       "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
-      "Channel": "lts",
+      "Architecture": "amd64",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
@@ -505,7 +638,20 @@
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
+      "IsLinux": false,
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     }
   ]

From 9a27908262fcf52130335fc58d6e5b7c4c8b32af Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 17 Oct 2022 17:34:49 -0700
Subject: [PATCH 254/354] Enable Component Governance on ARM64 (#700)

* Re-enable CG

* set dotnet path variable
---
 .vsts-ci/phase.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 846f64969..85ecc08ad 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -101,6 +101,17 @@ jobs:
     displayName: dotnet info
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
+  - pwsh: |
+      $dotnetFolder = split-path (gcm dotnet).source
+      Write-Host "##vso[task.setvariable variable=GOVERNANCE_SYSTEM_DOTNET;]$dotnetFolder"
+    displayName: Set GOVERNANCE_SYSTEM_DOTNET
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - pwsh: |
+      Get-ChildItem env:\GOVERNANCE*
+    displayName: 'Capture GOVERNANCE* Environment Variables'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
   - task: ComponentGovernanceComponentDetection@0
     inputs:
       dockerImagesToScan: $(dockerImagesToScan)
@@ -109,7 +120,11 @@ jobs:
       alertWarningLevel: 'High'
       failOnAlert: true
     displayName: Component Governance - $(ImageName) $(Channel)
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],''))
+    condition: |
+      and(
+          succeededOrFailed(),
+          ne(variables['Channel'],'')
+        )
 
   - pwsh: |
       if ( '$env:CHANNEL' -eq '' ) { exit }

From 03c14182198e61af37f3cf005aa6e0a05b9d5238 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 19 Oct 2022 15:03:42 -0400
Subject: [PATCH 255/354] Update preview image size (#716)

* update image sizes for linux images

* remove -Pending from image size test

* fix test deps image sizes for failing tests
---
 release/7-3/alpine313/docker/Dockerfile     | 2 +-
 release/7-3/alpine313/meta.json             | 2 +-
 release/7-3/alpine314/docker/Dockerfile     | 2 +-
 release/7-3/alpine314/meta.json             | 2 +-
 release/7-3/alpine315/docker/Dockerfile     | 2 +-
 release/7-3/alpine315/meta.json             | 2 +-
 release/7-3/debian10/docker/Dockerfile      | 4 ++--
 release/7-3/debian10/meta.json              | 2 +-
 release/7-3/debian10/test-deps/meta.json    | 2 +-
 release/7-3/debian11/docker/Dockerfile      | 4 ++--
 release/7-3/debian11/meta.json              | 2 +-
 release/7-3/debian11/test-deps/meta.json    | 2 +-
 release/7-3/mariner2/docker/Dockerfile      | 7 ++++---
 release/7-3/mariner2/meta.json              | 2 +-
 release/7-3/ubi8/docker/Dockerfile          | 6 +++---
 release/7-3/ubi8/meta.json                  | 2 +-
 release/7-3/ubi9/docker/Dockerfile          | 6 +++---
 release/7-3/ubi9/meta.json                  | 2 +-
 release/7-3/ubi9/test-deps/meta.json        | 2 +-
 release/7-3/ubuntu20.04/docker/Dockerfile   | 4 ++--
 release/7-3/ubuntu20.04/meta.json           | 2 +-
 release/7-3/ubuntu20.04/test-deps/meta.json | 2 +-
 release/7-3/ubuntu22.04/docker/Dockerfile   | 4 ++--
 release/7-3/ubuntu22.04/meta.json           | 2 +-
 tests/container.tests.ps1                   | 3 +--
 25 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/release/7-3/alpine313/docker/Dockerfile b/release/7-3/alpine313/docker/Dockerfile
index 345c491eb..4ad38ae71 100644
--- a/release/7-3/alpine313/docker/Dockerfile
+++ b/release/7-3/alpine313/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM alpine:3.13 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/alpine313/meta.json b/release/7-3/alpine313/meta.json
index 8d6f4e2f1..a8feb7d02 100644
--- a/release/7-3/alpine313/meta.json
+++ b/release/7-3/alpine313/meta.json
@@ -10,7 +10,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 232
+        "size": 251
     },
     "EndOfLife": "2022-11-01",
     "DistributionState": "Validated",
diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
index a37bc2efb..fe5dc6cfb 100644
--- a/release/7-3/alpine314/docker/Dockerfile
+++ b/release/7-3/alpine314/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM alpine:3.14 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/alpine314/meta.json b/release/7-3/alpine314/meta.json
index ddddb75bb..f9f84eb1c 100644
--- a/release/7-3/alpine314/meta.json
+++ b/release/7-3/alpine314/meta.json
@@ -10,7 +10,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 232
+        "size": 251
     },
     "EndOfLife": "2023-05-01",
     "DistributionState": "Validated",
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
index 33895a79a..a13244bd4 100644
--- a/release/7-3/alpine315/docker/Dockerfile
+++ b/release/7-3/alpine315/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM alpine:3.15 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0-preview.1
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/alpine315/meta.json b/release/7-3/alpine315/meta.json
index a88206977..7d298d364 100644
--- a/release/7-3/alpine315/meta.json
+++ b/release/7-3/alpine315/meta.json
@@ -10,7 +10,7 @@
     "SkipGssNtlmSspTests": true,
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 221
+        "size": 252
     },
     "EndOfLife": "2023-11-01",
     "DistributionState": "Validating",
diff --git a/release/7-3/debian10/docker/Dockerfile b/release/7-3/debian10/docker/Dockerfile
index 6c72a15ca..595e31b58 100644
--- a/release/7-3/debian10/docker/Dockerfile
+++ b/release/7-3/debian10/docker/Dockerfile
@@ -7,7 +7,7 @@ ARG imageRepo=debian
 FROM ${imageRepo}:buster-slim AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
@@ -27,7 +27,7 @@ RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM ${imageRepo}:buster-slim
 
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 # Copy only the files we need from the previous stage
diff --git a/release/7-3/debian10/meta.json b/release/7-3/debian10/meta.json
index 5918160b0..201fe811b 100644
--- a/release/7-3/debian10/meta.json
+++ b/release/7-3/debian10/meta.json
@@ -11,7 +11,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 314
+        "size": 331
     },
     "EndOfLife": "2023-12-15",
     "DistributionState": "Validated"
diff --git a/release/7-3/debian10/test-deps/meta.json b/release/7-3/debian10/test-deps/meta.json
index 36de679e8..7194757d7 100644
--- a/release/7-3/debian10/test-deps/meta.json
+++ b/release/7-3/debian10/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 408
     }
 }
diff --git a/release/7-3/debian11/docker/Dockerfile b/release/7-3/debian11/docker/Dockerfile
index c2d611c8a..9437355b7 100644
--- a/release/7-3/debian11/docker/Dockerfile
+++ b/release/7-3/debian11/docker/Dockerfile
@@ -6,7 +6,7 @@
 FROM debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
@@ -26,7 +26,7 @@ RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM debian:bullseye-slim
 
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 # Copy only the files we need from the previous stage
diff --git a/release/7-3/debian11/meta.json b/release/7-3/debian11/meta.json
index 4325fbacc..004ca8c80 100644
--- a/release/7-3/debian11/meta.json
+++ b/release/7-3/debian11/meta.json
@@ -11,7 +11,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 350
+        "size": 340
     },
     "EndOfLife": "2023-12-15",
     "DistributionState": "Validated"
diff --git a/release/7-3/debian11/test-deps/meta.json b/release/7-3/debian11/test-deps/meta.json
index 424e8a54f..a9999ce7b 100644
--- a/release/7-3/debian11/test-deps/meta.json
+++ b/release/7-3/debian11/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 350
+        "size": 402
     }
 }
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
index 3e1f57555..61db08807 100644
--- a/release/7-3/mariner2/docker/Dockerfile
+++ b/release/7-3/mariner2/docker/Dockerfile
@@ -4,8 +4,9 @@
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.4
-ARG PS_PACKAGE=powershell-preview-${PS_VERSION}-1.cm1.x86_64.rpm
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
@@ -17,7 +18,7 @@ RUN echo ${PS_PACKAGE_URL}
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
 
-ARG PS_VERSION=7.3.0-preview.4
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 # Define Args and Env needed to create links
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index 58d299216..cb5f9c0f4 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -9,7 +9,7 @@
     "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 387
+        "size": 303
     },
     "EndOfLife": "2022-10-14",
     "DistributionState": "Validated"
diff --git a/release/7-3/ubi8/docker/Dockerfile b/release/7-3/ubi8/docker/Dockerfile
index e043f5d09..8bfa52029 100644
--- a/release/7-3/ubi8/docker/Dockerfile
+++ b/release/7-3/ubi8/docker/Dockerfile
@@ -2,8 +2,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
-ARG PS_VERSION=7.3.0-preview.1
-ARG PACKAGE_VERSION=7.3.0_preview.1
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
@@ -12,7 +12,7 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
 FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
-ARG PS_VERSION=7.3.0-preview.1
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 RUN --mount=type=cache,target=/var/cache/yum,rw \
diff --git a/release/7-3/ubi8/meta.json b/release/7-3/ubi8/meta.json
index a99f29fe0..71a866d35 100644
--- a/release/7-3/ubi8/meta.json
+++ b/release/7-3/ubi8/meta.json
@@ -10,7 +10,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 726
+        "size": 504
     },
     "DistributionState": "Validating",
     "EndOfLife": "2023-05-30"
diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
index 7d74d21d5..5c8653a3c 100644
--- a/release/7-3/ubi9/docker/Dockerfile
+++ b/release/7-3/ubi9/docker/Dockerfile
@@ -2,8 +2,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 FROM registry.access.redhat.com/ubi9/ubi AS installer-env
-ARG PS_VERSION=7.3.0-preview.1
-ARG PACKAGE_VERSION=7.3.0_preview.1
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
@@ -12,7 +12,7 @@ ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v$
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
 # start new stage so that the tar.gz layers are left behind in multi-stage build
 FROM registry.access.redhat.com/ubi9/ubi AS final-image
-ARG PS_VERSION=7.3.0-preview.1
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 RUN --mount=type=cache,target=/var/cache/yum,rw \
diff --git a/release/7-3/ubi9/meta.json b/release/7-3/ubi9/meta.json
index 09bd606c1..3c067062b 100644
--- a/release/7-3/ubi9/meta.json
+++ b/release/7-3/ubi9/meta.json
@@ -13,7 +13,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 502
+        "size": 508
     },
     "DistributionState": "ImageCreation",
     "EndOfLife": "2023-05-30"
diff --git a/release/7-3/ubi9/test-deps/meta.json b/release/7-3/ubi9/test-deps/meta.json
index 3e8e5584d..a0efea4fd 100644
--- a/release/7-3/ubi9/test-deps/meta.json
+++ b/release/7-3/ubi9/test-deps/meta.json
@@ -13,7 +13,7 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 502
+        "size": 566
     },
     "DistributionState": "ImageCreation",
     "EndOfLife": "2023-05-30"
diff --git a/release/7-3/ubuntu20.04/docker/Dockerfile b/release/7-3/ubuntu20.04/docker/Dockerfile
index 4027e2116..8190712b3 100644
--- a/release/7-3/ubuntu20.04/docker/Dockerfile
+++ b/release/7-3/ubuntu20.04/docker/Dockerfile
@@ -5,7 +5,7 @@
 FROM ubuntu:20.04 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.4
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
@@ -27,7 +27,7 @@ RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 # Start a new stage so we lose all the tar.gz layers from the final image
 FROM ubuntu:20.04 AS powershell
 
-ARG PS_VERSION=6.2.0-preview.3
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
 
 # Copy only the files we need from the previous stage
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
index c382c7671..84124cdae 100644
--- a/release/7-3/ubuntu20.04/meta.json
+++ b/release/7-3/ubuntu20.04/meta.json
@@ -10,7 +10,7 @@
         {"Tag": "20.04"}
     ],
     "TestProperties": {
-        "size": 355
+        "size": 340
     },
     "SubImage": "test-deps",
     "EndOfLife": "2023-12-15",
diff --git a/release/7-3/ubuntu20.04/test-deps/meta.json b/release/7-3/ubuntu20.04/test-deps/meta.json
index b01cc7075..b3ecab356 100644
--- a/release/7-3/ubuntu20.04/test-deps/meta.json
+++ b/release/7-3/ubuntu20.04/test-deps/meta.json
@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 358
+        "size": 410
     }
 }
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-3/ubuntu22.04/docker/Dockerfile
index dd05aebdf..3a3617ae2 100644
--- a/release/7-3/ubuntu22.04/docker/Dockerfile
+++ b/release/7-3/ubuntu22.04/docker/Dockerfile
@@ -5,7 +5,7 @@
 FROM ubuntu:22.04 AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.4
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/var/lib/apt \
 FROM ubuntu:22.04 AS final-image
 
 # # Define args needed to add the package
-ARG PS_VERSION=7.3.0-preview.4
+ARG PS_VERSION=7.3.0-preview.8
 ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
index 617666430..6aed4183b 100644
--- a/release/7-3/ubuntu22.04/meta.json
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -13,7 +13,7 @@
         "preview"
     ],
     "TestProperties": {
-        "size": 276
+        "size": 338
     },
     "SubImage": "test-deps",
     "EndOfLife": "2023-12-15",
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 60da876c9..5e5da6781 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -580,8 +580,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
             })
         }
 
-        # -Skip:$script:skipLinuxRun
-        it "Verify size of <name>" -TestCases $sizeTestCases -Pending {
+        it "Verify size of <name>" -TestCases $sizeTestCases -Skip:$script:skipLinuxRun {
             param(
                 [Parameter(Mandatory=$true)]
                 [string]

From 3b25ad714b3aca59cf033ce8d0ec1fa845275532 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 26 Oct 2022 15:05:52 -0400
Subject: [PATCH 256/354] remove arm component governance pwsh code (#718)

---
 .vsts-ci/phase.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 85ecc08ad..344de19d6 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -101,17 +101,6 @@ jobs:
     displayName: dotnet info
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: |
-      $dotnetFolder = split-path (gcm dotnet).source
-      Write-Host "##vso[task.setvariable variable=GOVERNANCE_SYSTEM_DOTNET;]$dotnetFolder"
-    displayName: Set GOVERNANCE_SYSTEM_DOTNET
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      Get-ChildItem env:\GOVERNANCE*
-    displayName: 'Capture GOVERNANCE* Environment Variables'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
   - task: ComponentGovernanceComponentDetection@0
     inputs:
       dockerImagesToScan: $(dockerImagesToScan)

From ef74686e163393a167e4e65469349df05efa0560 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 18:04:52 -0700
Subject: [PATCH 257/354] Update the release build yaml with the latest
 versions (#717)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 112166790..a17cf2b1d 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-preview.8'
+    default: 'v7.3.0-rc.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.6'
+    default: 'v7.2.7'
   - name: 'stableReleaseTag'
-    default: 'v7.2.6'
+    default: 'v7.2.7'
 
 resources:
 - repo: self

From d9249d76f017a8bdfafa547b1469591e7c4a7860 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 9 Nov 2022 14:55:07 -0800
Subject: [PATCH 258/354] Promote 7-3 to stable (#721)

---
 tools/buildHelper/channels.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index e07c64043..8e5e73bf2 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "stable",
-        "path": "release/7-2",
+        "path": "release/7-3",
         "pwshInstallVersion": "7",
         "packageTag": ""
     },

From 436200ac24b33d362168e020513326b80ee2d011 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 9 Nov 2022 16:03:42 -0800
Subject: [PATCH 259/354] Delete images identified as EOL (#722)

---
 release/7-2/alpine313/docker/Dockerfile       | 89 ------------------
 release/7-2/alpine313/meta.json               | 21 -----
 .../7-2/alpine313/test-deps/docker/Dockerfile | 35 -------
 release/7-2/alpine313/test-deps/meta.json     | 16 ----
 release/7-2/debian9/docker/Dockerfile         | 64 -------------
 release/7-2/debian9/meta.json                 | 21 -----
 .../7-2/debian9/test-deps/docker/Dockerfile   | 24 -----
 release/7-2/debian9/test-deps/meta.json       | 16 ----
 release/7-3/alpine313/docker/Dockerfile       | 91 -------------------
 release/7-3/alpine313/meta.json               | 18 ----
 .../7-3/alpine313/test-deps/docker/Dockerfile | 35 -------
 release/7-3/alpine313/test-deps/meta.json     | 16 ----
 release/7-3/ubi8/meta.json                    |  2 +-
 13 files changed, 1 insertion(+), 447 deletions(-)
 delete mode 100644 release/7-2/alpine313/docker/Dockerfile
 delete mode 100644 release/7-2/alpine313/meta.json
 delete mode 100644 release/7-2/alpine313/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/alpine313/test-deps/meta.json
 delete mode 100644 release/7-2/debian9/docker/Dockerfile
 delete mode 100644 release/7-2/debian9/meta.json
 delete mode 100644 release/7-2/debian9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/debian9/test-deps/meta.json
 delete mode 100644 release/7-3/alpine313/docker/Dockerfile
 delete mode 100644 release/7-3/alpine313/meta.json
 delete mode 100644 release/7-3/alpine313/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/alpine313/test-deps/meta.json

diff --git a/release/7-2/alpine313/docker/Dockerfile b/release/7-2/alpine313/docker/Dockerfile
deleted file mode 100644
index e2d479653..000000000
--- a/release/7-2/alpine313/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.13 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.13
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    && apk update \
-    && apk upgrade \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine313/meta.json b/release/7-2/alpine313/meta.json
deleted file mode 100644
index e7120874d..000000000
--- a/release/7-2/alpine313/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.13"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 235
-    },
-    "EndOfLife": "2022-11-01",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-2/alpine313/test-deps/docker/Dockerfile b/release/7-2/alpine313/test-deps/docker/Dockerfile
deleted file mode 100644
index 6f60dcef1..000000000
--- a/release/7-2/alpine313/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add  --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine313/test-deps/meta.json b/release/7-2/alpine313/test-deps/meta.json
deleted file mode 100644
index 00007c0fd..000000000
--- a/release/7-2/alpine313/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-2/debian9/docker/Dockerfile b/release/7-2/debian9/docker/Dockerfile
deleted file mode 100644
index 45db57bdc..000000000
--- a/release/7-2/debian9/docker/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:stretch-slim AS installer-env
-
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-9
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian9/meta.json b/release/7-2/debian9/meta.json
deleted file mode 100644
index 0731f2151..000000000
--- a/release/7-2/debian9/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Debian 9",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "stretch-slim"},
-        {"Tag": "9"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    },
-    "EndOfLife": "2022-06-30",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-2/debian9/test-deps/docker/Dockerfile b/release/7-2/debian9/test-deps/docker/Dockerfile
deleted file mode 100644
index 4810ee352..000000000
--- a/release/7-2/debian9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian 9 image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian9/test-deps/meta.json b/release/7-2/debian9/test-deps/meta.json
deleted file mode 100644
index e9fb75b19..000000000
--- a/release/7-2/debian9/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 9",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 370
-    }
-}
diff --git a/release/7-3/alpine313/docker/Dockerfile b/release/7-3/alpine313/docker/Dockerfile
deleted file mode 100644
index 4ad38ae71..000000000
--- a/release/7-3/alpine313/docker/Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.13 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.13 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.13
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.13
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-    ca-certificates \
-    less \
-    \
-    # PSReadline/console dependencies
-    ncurses-terminfo-base \
-    \
-    # .NET Core dependencies
-    krb5-libs \
-    libgcc \
-    libintl \
-    libssl1.1 \
-    libstdc++ \
-    tzdata \
-    userspace-rcu \
-    zlib \
-    icu-libs \
-    && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-    lttng-ust \
-    \
-    # PowerShell remoting over SSH dependencies
-    openssh-client \
-    \
-    && apk update \
-    && apk upgrade \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    \
-    # Create the pwsh-preview symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    # Give all user execute permissions and remove write permissions for others
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine313/meta.json b/release/7-3/alpine313/meta.json
deleted file mode 100644
index a8feb7d02..000000000
--- a/release/7-3/alpine313/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.13",
-    "ShortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.13"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 251
-    },
-    "EndOfLife": "2022-11-01",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-3/alpine313/test-deps/docker/Dockerfile b/release/7-3/alpine313/test-deps/docker/Dockerfile
deleted file mode 100644
index d34f657d0..000000000
--- a/release/7-3/alpine313/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.13
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.13
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache  \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine313/test-deps/meta.json b/release/7-3/alpine313/test-deps/meta.json
deleted file mode 100644
index 00007c0fd..000000000
--- a/release/7-3/alpine313/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.13",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-3/ubi8/meta.json b/release/7-3/ubi8/meta.json
index 71a866d35..9639070ce 100644
--- a/release/7-3/ubi8/meta.json
+++ b/release/7-3/ubi8/meta.json
@@ -10,7 +10,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 504
+        "size": 625
     },
     "DistributionState": "Validating",
     "EndOfLife": "2023-05-30"

From 628f09fe188aef03131fb058f554cfb7f419d2e8 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Thu, 17 Nov 2022 15:44:35 -0500
Subject: [PATCH 260/354] Sort keys of matrix json on update (#723)

---
 .github/workflows/update.yml |   8 +-
 assets/matrix.json           | 513 +++++++++++++++--------------------
 build.ps1                    |  22 +-
 tools/updateJson.ps1         |  12 +
 4 files changed, 253 insertions(+), 302 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 480d2fec0..5de410d27 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -58,9 +58,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Auto-update JSON
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+
+      - name: Auto-update Matrix JSON
         run: |
           ./tools/updateJson.ps1
+
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
diff --git a/assets/matrix.json b/assets/matrix.json
index 124429925..a3bf70f57 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,34 +1,8 @@
 {
-  "preview": [
-    {
-      "Architecture": "amd64",
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
-    },
-    {
-      "Architecture": "amd64",
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
-      "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "preview-7.3-alpine-3.13;preview-alpine-3.13",
-      "UseInCI": false
-    },
+  "lts": [
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
@@ -36,12 +10,12 @@
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
@@ -49,90 +23,103 @@
       "IsLinux": true,
       "JobName": "ubi8",
       "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
       "Architecture": "arm64",
-      "Channel": "preview",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
@@ -140,105 +127,92 @@
       "IsLinux": true,
       "JobName": "ubuntu22.04_arm32v7",
       "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
+      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
       "Architecture": "arm64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "ImageName": "ubuntu18.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-01-09T00:00:00",
       "ImageName": "nanoserver1809",
       "IsLinux": false,
       "JobName": "nanoserver1809",
       "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
+      "EndOfLife": "2024-11-30T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ],
-  "lts": [
-    {
-      "Architecture": "amd64",
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
-      "UseInCI": true
-    },
+  "preview": [
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "lts-7.2-alpine-3.13;lts-alpine-3.13",
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2022-10-14T00:00:00",
@@ -246,12 +220,12 @@
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-05-30T00:00:00",
@@ -259,176 +233,163 @@
       "IsLinux": true,
       "JobName": "ubi8",
       "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
+      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "lts-7.2-debian-stretch-slim;lts-7.2-debian-9;lts-debian-stretch-slim;lts-debian-9",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
-      "UseInCI": true
+      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
       "UseInCI": true
     },
     {
       "Architecture": "arm64",
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
-      "UseInCI": false
-    },
-    {
-      "Architecture": "arm64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
       "Architecture": "arm64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver1809",
       "IsLinux": false,
       "JobName": "nanoserver1809",
       "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "lts",
+      "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -437,26 +398,13 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.2-ubuntu-jammy;7.2-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "UseInCI": true
-    },
-    {
-      "Architecture": "amd64",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2022-11-01T00:00:00",
-      "ImageName": "alpine313",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "alpine313",
-      "OsVersion": "Alpine 3.13",
-      "TagList": "7.2-alpine-3.13;alpine-3.13",
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "7.3-alpine-3.15;alpine-3.15",
       "UseInCI": false
     },
     {
@@ -469,7 +417,7 @@
       "IsLinux": true,
       "JobName": "mariner2",
       "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "7.2-mariner-2.0;mariner-2.0",
+      "TagList": "7.3-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
@@ -482,7 +430,7 @@
       "IsLinux": true,
       "JobName": "ubi8",
       "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "7.2-ubi-8;ubi-8",
+      "TagList": "7.3-ubi-8;ubi-8",
       "UseInCI": true
     },
     {
@@ -490,77 +438,77 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.2-debian-buster-slim;7.2-debian-10;debian-buster-slim;debian-10",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-06-30T00:00:00",
-      "ImageName": "debian9",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "debian9",
-      "OsVersion": "Debian 9 (End of Life)",
-      "TagList": "7.2-debian-stretch-slim;7.2-debian-9;debian-stretch-slim;debian-9",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "7.3-alpine-3.14;alpine-3.14",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "ubuntu20.04",
       "IsLinux": true,
       "JobName": "ubuntu20.04",
       "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.2-ubuntu-focal;7.2-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
-      "UseInCI": true
+      "TagList": "7.3-ubuntu-focal;7.3-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "7.2-ubuntu-bionic;7.2-ubuntu-18.04;ubuntu-bionic;ubuntu-18.04",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "7.2-alpine-3.14;alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "7.3-ubi-9;ubi-9",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.2-debian-bullseye-slim;7.2-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.3-debian-buster-slim;7.3-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
@@ -569,24 +517,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-focal-arm32;7.2-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
-      "UseInCI": false
-    },
-    {
-      "Architecture": "arm64",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-bionic-arm32;7.2-ubuntu-18.04-arm32;ubuntu-bionic-arm32;ubuntu-18.04-arm32",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "TagList": "7.3-ubuntu-jammy-arm32;7.3-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
@@ -595,11 +530,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "7.2-ubuntu-jammy-arm32;7.2-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "7.3-ubuntu-focal-arm32;7.3-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
@@ -607,12 +542,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver1809",
       "IsLinux": false,
       "JobName": "nanoserver1809",
       "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.2-nanoserver-1809;nanoserver-1809",
+      "TagList": "7.3-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -620,12 +555,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.2-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.3-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -633,12 +568,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
+      "EndOfLife": "2023-12-15T00:00:00",
       "ImageName": "nanoserver2022",
       "IsLinux": false,
       "JobName": "nanoserver2022",
       "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.2-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "TagList": "7.3-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -646,12 +581,12 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.2-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ]
diff --git a/build.ps1 b/build.ps1
index d72484107..97b620e99 100755
--- a/build.ps1
+++ b/build.ps1
@@ -600,21 +600,21 @@ End {
                     foreach ($architectureGroup in $architectureGroups) {
                         $architectureName = $architectureGroup.Name
 
-                    # Filter out subimages.  We cannot directly build subimages.
+                        # Filter out subimages.  We cannot directly build subimages.
                         foreach ($tag in $architectureGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property dockerfile) {
-                        if (-not $matrix.ContainsKey($channelName)) {
-                            $matrix.Add($channelName, @{ })
-                        }
+                            if (-not $matrix.ContainsKey($channelName)) {
+                                $matrix.Add($channelName, @{ })
+                            }
 
-                        if (-not $matrix.$channelName.ContainsKey($osName)) {
-                            $matrix.$channelName.Add($osName, @{ })
-                        }
+                            if (-not $matrix.$channelName.ContainsKey($osName)) {
+                                $matrix.$channelName.Add($osName, @{ })
+                            }
 
                             if (-not $matrix.$channelName.$osName.ContainsKey($architectureName)) {
                                 $matrix.$channelName.$osName.Add($architectureName, @{})
                             }
 
-                        $jobName = $tag.Name -replace '-', '_'
+                            $jobName = $tag.Name -replace '-', '_'
                             if (-not $matrix.$channelName[$osName][$architectureName].ContainsKey($jobName) -and -not $tag.ContinueOnError) {
                                 $matrix.$channelName[$osName][$architectureName].Add($jobName, (ConvertTo-SortedDictionary -Hashtable @{
                                     Channel           = $tag.Channel
@@ -628,10 +628,8 @@ End {
                                     TagList           = $tag.Tags -join ';'
                                     IsLinux           = $tag.IsLinux
                                     UseInCI           = $tag.UseInCI
-                                            Architecture      = $tag.Architecture
-                                        }
-                                    )
-                                )
+                                    Architecture      = $tag.Architecture
+                                }))
                             }
                         }
                     }
diff --git a/tools/updateJson.ps1 b/tools/updateJson.ps1
index 1fb64dd5c..53b7b92c4 100644
--- a/tools/updateJson.ps1
+++ b/tools/updateJson.ps1
@@ -52,6 +52,18 @@ if (!$diffFound) {
 if ($diffFound) {
     Write-Verbose -message "diff found" -Verbose
     $json > $jsonPath
+
+    $hasNode = Get-Command -Name 'node' -ErrorAction SilentlyContinue
+    $hasNpx = Get-Command -Name 'npx' -ErrorAction SilentlyContinue
+    if ($hasNode && $hasNpx) {
+        Write-Verbose -Message "Sorting the keys of the matrix JSON..." -Verbose
+        start-nativeExecution {
+            npx -y json-sort-cli assets/matrix.json
+        }
+        Write-Verbose -Message "Sorting complete." -Verbose
+    } else {
+        Write-Verbose -Message "Node or npx are not available, skipping matrix JSON sorting." -Verbose
+    }
 }
 else {
     Write-Verbose -Message "no diff found" -Verbose

From 6fb5d18ecb898ca248c027ec021c1dda59a05474 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Tue, 20 Dec 2022 14:54:30 -0800
Subject: [PATCH 261/354] Copy 7-3 to 7-4 using git mv

---
 release/{7-3 => 7-4}/alpine314/docker/Dockerfile             | 0
 release/{7-3 => 7-4}/alpine314/meta.json                     | 0
 release/{7-3 => 7-4}/alpine314/test-deps/docker/Dockerfile   | 0
 release/{7-3 => 7-4}/alpine314/test-deps/meta.json           | 0
 release/{7-3 => 7-4}/alpine315/docker/Dockerfile             | 0
 release/{7-3 => 7-4}/alpine315/meta.json                     | 0
 release/{7-3 => 7-4}/alpine315/test-deps/docker/Dockerfile   | 0
 release/{7-3 => 7-4}/alpine315/test-deps/meta.json           | 0
 release/{7-3 => 7-4}/debian10/docker/Dockerfile              | 0
 release/{7-3 => 7-4}/debian10/meta.json                      | 0
 release/{7-3 => 7-4}/debian10/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-4}/debian10/test-deps/meta.json            | 0
 release/{7-3 => 7-4}/debian11/docker/Dockerfile              | 0
 release/{7-3 => 7-4}/debian11/meta.json                      | 0
 release/{7-3 => 7-4}/debian11/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-4}/debian11/test-deps/meta.json            | 0
 release/{7-3 => 7-4}/mariner2/docker/Dockerfile              | 0
 release/{7-3 => 7-4}/mariner2/meta.json                      | 0
 release/{7-3 => 7-4}/mariner2/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-4}/mariner2/test-deps/meta.json            | 0
 release/{7-3 => 7-4}/nanoserver1809/docker/Dockerfile        | 0
 release/{7-3 => 7-4}/nanoserver1809/meta.json                | 0
 release/{7-3 => 7-4}/nanoserver2022/docker/Dockerfile        | 0
 release/{7-3 => 7-4}/nanoserver2022/meta.json                | 0
 release/{7-3 => 7-4}/ubi8/docker/Dockerfile                  | 0
 release/{7-3 => 7-4}/ubi8/meta.json                          | 0
 release/{7-3 => 7-4}/ubi8/test-deps/docker/Dockerfile        | 0
 release/{7-3 => 7-4}/ubi8/test-deps/meta.json                | 0
 release/{7-3 => 7-4}/ubi9/docker/Dockerfile                  | 0
 release/{7-3 => 7-4}/ubi9/meta.json                          | 0
 release/{7-3 => 7-4}/ubi9/test-deps/docker/Dockerfile        | 0
 release/{7-3 => 7-4}/ubi9/test-deps/meta.json                | 0
 release/{7-3 => 7-4}/ubuntu20.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3 => 7-4}/ubuntu20.04-arm32v7/meta.json           | 0
 release/{7-3 => 7-4}/ubuntu20.04/docker/Dockerfile           | 0
 release/{7-3 => 7-4}/ubuntu20.04/meta.json                   | 0
 release/{7-3 => 7-4}/ubuntu20.04/test-deps/docker/Dockerfile | 0
 release/{7-3 => 7-4}/ubuntu20.04/test-deps/meta.json         | 0
 release/{7-3 => 7-4}/ubuntu22.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3 => 7-4}/ubuntu22.04-arm32v7/meta.json           | 0
 release/{7-3 => 7-4}/ubuntu22.04/docker/Dockerfile           | 0
 release/{7-3 => 7-4}/ubuntu22.04/meta.json                   | 0
 release/{7-3 => 7-4}/ubuntu22.04/test-deps/docker/Dockerfile | 0
 release/{7-3 => 7-4}/ubuntu22.04/test-deps/meta.json         | 0
 release/{7-3 => 7-4}/windowsserver2022/docker/Dockerfile     | 0
 release/{7-3 => 7-4}/windowsserver2022/meta.json             | 0
 release/{7-3 => 7-4}/windowsservercore2022/docker/Dockerfile | 0
 release/{7-3 => 7-4}/windowsservercore2022/meta.json         | 0
 48 files changed, 0 insertions(+), 0 deletions(-)
 rename release/{7-3 => 7-4}/alpine314/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/alpine314/meta.json (100%)
 rename release/{7-3 => 7-4}/alpine314/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/alpine314/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/alpine315/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/alpine315/meta.json (100%)
 rename release/{7-3 => 7-4}/alpine315/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/alpine315/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/debian10/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/debian10/meta.json (100%)
 rename release/{7-3 => 7-4}/debian10/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/debian10/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/debian11/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/debian11/meta.json (100%)
 rename release/{7-3 => 7-4}/debian11/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/debian11/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/mariner2/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/mariner2/meta.json (100%)
 rename release/{7-3 => 7-4}/mariner2/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/mariner2/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/nanoserver1809/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/nanoserver1809/meta.json (100%)
 rename release/{7-3 => 7-4}/nanoserver2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/nanoserver2022/meta.json (100%)
 rename release/{7-3 => 7-4}/ubi8/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubi8/meta.json (100%)
 rename release/{7-3 => 7-4}/ubi8/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubi8/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/ubi9/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubi9/meta.json (100%)
 rename release/{7-3 => 7-4}/ubi9/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubi9/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04-arm32v7/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu20.04/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04-arm32v7/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04/meta.json (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/ubuntu22.04/test-deps/meta.json (100%)
 rename release/{7-3 => 7-4}/windowsserver2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/windowsserver2022/meta.json (100%)
 rename release/{7-3 => 7-4}/windowsservercore2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-4}/windowsservercore2022/meta.json (100%)

diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-4/alpine314/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine314/docker/Dockerfile
rename to release/7-4/alpine314/docker/Dockerfile
diff --git a/release/7-3/alpine314/meta.json b/release/7-4/alpine314/meta.json
similarity index 100%
rename from release/7-3/alpine314/meta.json
rename to release/7-4/alpine314/meta.json
diff --git a/release/7-3/alpine314/test-deps/docker/Dockerfile b/release/7-4/alpine314/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine314/test-deps/docker/Dockerfile
rename to release/7-4/alpine314/test-deps/docker/Dockerfile
diff --git a/release/7-3/alpine314/test-deps/meta.json b/release/7-4/alpine314/test-deps/meta.json
similarity index 100%
rename from release/7-3/alpine314/test-deps/meta.json
rename to release/7-4/alpine314/test-deps/meta.json
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-4/alpine315/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine315/docker/Dockerfile
rename to release/7-4/alpine315/docker/Dockerfile
diff --git a/release/7-3/alpine315/meta.json b/release/7-4/alpine315/meta.json
similarity index 100%
rename from release/7-3/alpine315/meta.json
rename to release/7-4/alpine315/meta.json
diff --git a/release/7-3/alpine315/test-deps/docker/Dockerfile b/release/7-4/alpine315/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine315/test-deps/docker/Dockerfile
rename to release/7-4/alpine315/test-deps/docker/Dockerfile
diff --git a/release/7-3/alpine315/test-deps/meta.json b/release/7-4/alpine315/test-deps/meta.json
similarity index 100%
rename from release/7-3/alpine315/test-deps/meta.json
rename to release/7-4/alpine315/test-deps/meta.json
diff --git a/release/7-3/debian10/docker/Dockerfile b/release/7-4/debian10/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian10/docker/Dockerfile
rename to release/7-4/debian10/docker/Dockerfile
diff --git a/release/7-3/debian10/meta.json b/release/7-4/debian10/meta.json
similarity index 100%
rename from release/7-3/debian10/meta.json
rename to release/7-4/debian10/meta.json
diff --git a/release/7-3/debian10/test-deps/docker/Dockerfile b/release/7-4/debian10/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian10/test-deps/docker/Dockerfile
rename to release/7-4/debian10/test-deps/docker/Dockerfile
diff --git a/release/7-3/debian10/test-deps/meta.json b/release/7-4/debian10/test-deps/meta.json
similarity index 100%
rename from release/7-3/debian10/test-deps/meta.json
rename to release/7-4/debian10/test-deps/meta.json
diff --git a/release/7-3/debian11/docker/Dockerfile b/release/7-4/debian11/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian11/docker/Dockerfile
rename to release/7-4/debian11/docker/Dockerfile
diff --git a/release/7-3/debian11/meta.json b/release/7-4/debian11/meta.json
similarity index 100%
rename from release/7-3/debian11/meta.json
rename to release/7-4/debian11/meta.json
diff --git a/release/7-3/debian11/test-deps/docker/Dockerfile b/release/7-4/debian11/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian11/test-deps/docker/Dockerfile
rename to release/7-4/debian11/test-deps/docker/Dockerfile
diff --git a/release/7-3/debian11/test-deps/meta.json b/release/7-4/debian11/test-deps/meta.json
similarity index 100%
rename from release/7-3/debian11/test-deps/meta.json
rename to release/7-4/debian11/test-deps/meta.json
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-4/mariner2/docker/Dockerfile
similarity index 100%
rename from release/7-3/mariner2/docker/Dockerfile
rename to release/7-4/mariner2/docker/Dockerfile
diff --git a/release/7-3/mariner2/meta.json b/release/7-4/mariner2/meta.json
similarity index 100%
rename from release/7-3/mariner2/meta.json
rename to release/7-4/mariner2/meta.json
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-4/mariner2/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/mariner2/test-deps/docker/Dockerfile
rename to release/7-4/mariner2/test-deps/docker/Dockerfile
diff --git a/release/7-3/mariner2/test-deps/meta.json b/release/7-4/mariner2/test-deps/meta.json
similarity index 100%
rename from release/7-3/mariner2/test-deps/meta.json
rename to release/7-4/mariner2/test-deps/meta.json
diff --git a/release/7-3/nanoserver1809/docker/Dockerfile b/release/7-4/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/7-3/nanoserver1809/docker/Dockerfile
rename to release/7-4/nanoserver1809/docker/Dockerfile
diff --git a/release/7-3/nanoserver1809/meta.json b/release/7-4/nanoserver1809/meta.json
similarity index 100%
rename from release/7-3/nanoserver1809/meta.json
rename to release/7-4/nanoserver1809/meta.json
diff --git a/release/7-3/nanoserver2022/docker/Dockerfile b/release/7-4/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/nanoserver2022/docker/Dockerfile
rename to release/7-4/nanoserver2022/docker/Dockerfile
diff --git a/release/7-3/nanoserver2022/meta.json b/release/7-4/nanoserver2022/meta.json
similarity index 100%
rename from release/7-3/nanoserver2022/meta.json
rename to release/7-4/nanoserver2022/meta.json
diff --git a/release/7-3/ubi8/docker/Dockerfile b/release/7-4/ubi8/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi8/docker/Dockerfile
rename to release/7-4/ubi8/docker/Dockerfile
diff --git a/release/7-3/ubi8/meta.json b/release/7-4/ubi8/meta.json
similarity index 100%
rename from release/7-3/ubi8/meta.json
rename to release/7-4/ubi8/meta.json
diff --git a/release/7-3/ubi8/test-deps/docker/Dockerfile b/release/7-4/ubi8/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi8/test-deps/docker/Dockerfile
rename to release/7-4/ubi8/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubi8/test-deps/meta.json b/release/7-4/ubi8/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubi8/test-deps/meta.json
rename to release/7-4/ubi8/test-deps/meta.json
diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-4/ubi9/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi9/docker/Dockerfile
rename to release/7-4/ubi9/docker/Dockerfile
diff --git a/release/7-3/ubi9/meta.json b/release/7-4/ubi9/meta.json
similarity index 100%
rename from release/7-3/ubi9/meta.json
rename to release/7-4/ubi9/meta.json
diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-4/ubi9/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi9/test-deps/docker/Dockerfile
rename to release/7-4/ubi9/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubi9/test-deps/meta.json b/release/7-4/ubi9/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubi9/test-deps/meta.json
rename to release/7-4/ubi9/test-deps/meta.json
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
rename to release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-4/ubuntu20.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/meta.json
rename to release/7-4/ubuntu20.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu20.04/docker/Dockerfile b/release/7-4/ubuntu20.04/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04/docker/Dockerfile
rename to release/7-4/ubuntu20.04/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-4/ubuntu20.04/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04/meta.json
rename to release/7-4/ubuntu20.04/meta.json
diff --git a/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-4/ubuntu20.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
rename to release/7-4/ubuntu20.04/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04/test-deps/meta.json b/release/7-4/ubuntu20.04/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04/test-deps/meta.json
rename to release/7-4/ubuntu20.04/test-deps/meta.json
diff --git a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-4/ubuntu22.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/meta.json
rename to release/7-4/ubuntu22.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-4/ubuntu22.04/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04/docker/Dockerfile
rename to release/7-4/ubuntu22.04/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-4/ubuntu22.04/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04/meta.json
rename to release/7-4/ubuntu22.04/meta.json
diff --git a/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-4/ubuntu22.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
rename to release/7-4/ubuntu22.04/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04/test-deps/meta.json b/release/7-4/ubuntu22.04/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04/test-deps/meta.json
rename to release/7-4/ubuntu22.04/test-deps/meta.json
diff --git a/release/7-3/windowsserver2022/docker/Dockerfile b/release/7-4/windowsserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/windowsserver2022/docker/Dockerfile
rename to release/7-4/windowsserver2022/docker/Dockerfile
diff --git a/release/7-3/windowsserver2022/meta.json b/release/7-4/windowsserver2022/meta.json
similarity index 100%
rename from release/7-3/windowsserver2022/meta.json
rename to release/7-4/windowsserver2022/meta.json
diff --git a/release/7-3/windowsservercore2022/docker/Dockerfile b/release/7-4/windowsservercore2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/windowsservercore2022/docker/Dockerfile
rename to release/7-4/windowsservercore2022/docker/Dockerfile
diff --git a/release/7-3/windowsservercore2022/meta.json b/release/7-4/windowsservercore2022/meta.json
similarity index 100%
rename from release/7-3/windowsservercore2022/meta.json
rename to release/7-4/windowsservercore2022/meta.json

From 36696b3c61a93e2acc6b22b4a1927e03e4114075 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Tue, 20 Dec 2022 14:56:54 -0800
Subject: [PATCH 262/354] move 7-3 to 7-3-Copy before me moved 7-3 to 7-4 to
 preserve history

---
 release/{7-3 => 7-3-Copy}/alpine314/docker/Dockerfile             | 0
 release/{7-3 => 7-3-Copy}/alpine314/meta.json                     | 0
 release/{7-3 => 7-3-Copy}/alpine314/test-deps/docker/Dockerfile   | 0
 release/{7-3 => 7-3-Copy}/alpine314/test-deps/meta.json           | 0
 release/{7-3 => 7-3-Copy}/alpine315/docker/Dockerfile             | 0
 release/{7-3 => 7-3-Copy}/alpine315/meta.json                     | 0
 release/{7-3 => 7-3-Copy}/alpine315/test-deps/docker/Dockerfile   | 0
 release/{7-3 => 7-3-Copy}/alpine315/test-deps/meta.json           | 0
 release/{7-3 => 7-3-Copy}/debian10/docker/Dockerfile              | 0
 release/{7-3 => 7-3-Copy}/debian10/meta.json                      | 0
 release/{7-3 => 7-3-Copy}/debian10/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-3-Copy}/debian10/test-deps/meta.json            | 0
 release/{7-3 => 7-3-Copy}/debian11/docker/Dockerfile              | 0
 release/{7-3 => 7-3-Copy}/debian11/meta.json                      | 0
 release/{7-3 => 7-3-Copy}/debian11/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-3-Copy}/debian11/test-deps/meta.json            | 0
 release/{7-3 => 7-3-Copy}/mariner2/docker/Dockerfile              | 0
 release/{7-3 => 7-3-Copy}/mariner2/meta.json                      | 0
 release/{7-3 => 7-3-Copy}/mariner2/test-deps/docker/Dockerfile    | 0
 release/{7-3 => 7-3-Copy}/mariner2/test-deps/meta.json            | 0
 release/{7-3 => 7-3-Copy}/nanoserver1809/docker/Dockerfile        | 0
 release/{7-3 => 7-3-Copy}/nanoserver1809/meta.json                | 0
 release/{7-3 => 7-3-Copy}/nanoserver2022/docker/Dockerfile        | 0
 release/{7-3 => 7-3-Copy}/nanoserver2022/meta.json                | 0
 release/{7-3 => 7-3-Copy}/ubi8/docker/Dockerfile                  | 0
 release/{7-3 => 7-3-Copy}/ubi8/meta.json                          | 0
 release/{7-3 => 7-3-Copy}/ubi8/test-deps/docker/Dockerfile        | 0
 release/{7-3 => 7-3-Copy}/ubi8/test-deps/meta.json                | 0
 release/{7-3 => 7-3-Copy}/ubi9/docker/Dockerfile                  | 0
 release/{7-3 => 7-3-Copy}/ubi9/meta.json                          | 0
 release/{7-3 => 7-3-Copy}/ubi9/test-deps/docker/Dockerfile        | 0
 release/{7-3 => 7-3-Copy}/ubi9/test-deps/meta.json                | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04-arm32v7/meta.json           | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04/docker/Dockerfile           | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04/meta.json                   | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04/test-deps/docker/Dockerfile | 0
 release/{7-3 => 7-3-Copy}/ubuntu20.04/test-deps/meta.json         | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04-arm32v7/meta.json           | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04/docker/Dockerfile           | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04/meta.json                   | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04/test-deps/docker/Dockerfile | 0
 release/{7-3 => 7-3-Copy}/ubuntu22.04/test-deps/meta.json         | 0
 release/{7-3 => 7-3-Copy}/windowsserver2022/docker/Dockerfile     | 0
 release/{7-3 => 7-3-Copy}/windowsserver2022/meta.json             | 0
 release/{7-3 => 7-3-Copy}/windowsservercore2022/docker/Dockerfile | 0
 release/{7-3 => 7-3-Copy}/windowsservercore2022/meta.json         | 0
 48 files changed, 0 insertions(+), 0 deletions(-)
 rename release/{7-3 => 7-3-Copy}/alpine314/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/alpine314/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/alpine314/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/alpine314/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/alpine315/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/alpine315/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/alpine315/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/alpine315/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/debian10/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/debian10/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/debian10/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/debian10/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/debian11/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/debian11/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/debian11/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/debian11/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/mariner2/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/mariner2/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/mariner2/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/mariner2/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/nanoserver1809/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/nanoserver1809/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/nanoserver2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/nanoserver2022/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubi8/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubi8/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubi8/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubi8/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubi9/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubi9/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubi9/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubi9/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04-arm32v7/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu20.04/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04-arm32v7/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/ubuntu22.04/test-deps/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/windowsserver2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/windowsserver2022/meta.json (100%)
 rename release/{7-3 => 7-3-Copy}/windowsservercore2022/docker/Dockerfile (100%)
 rename release/{7-3 => 7-3-Copy}/windowsservercore2022/meta.json (100%)

diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-3-Copy/alpine314/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine314/docker/Dockerfile
rename to release/7-3-Copy/alpine314/docker/Dockerfile
diff --git a/release/7-3/alpine314/meta.json b/release/7-3-Copy/alpine314/meta.json
similarity index 100%
rename from release/7-3/alpine314/meta.json
rename to release/7-3-Copy/alpine314/meta.json
diff --git a/release/7-3/alpine314/test-deps/docker/Dockerfile b/release/7-3-Copy/alpine314/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine314/test-deps/docker/Dockerfile
rename to release/7-3-Copy/alpine314/test-deps/docker/Dockerfile
diff --git a/release/7-3/alpine314/test-deps/meta.json b/release/7-3-Copy/alpine314/test-deps/meta.json
similarity index 100%
rename from release/7-3/alpine314/test-deps/meta.json
rename to release/7-3-Copy/alpine314/test-deps/meta.json
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3-Copy/alpine315/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine315/docker/Dockerfile
rename to release/7-3-Copy/alpine315/docker/Dockerfile
diff --git a/release/7-3/alpine315/meta.json b/release/7-3-Copy/alpine315/meta.json
similarity index 100%
rename from release/7-3/alpine315/meta.json
rename to release/7-3-Copy/alpine315/meta.json
diff --git a/release/7-3/alpine315/test-deps/docker/Dockerfile b/release/7-3-Copy/alpine315/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/alpine315/test-deps/docker/Dockerfile
rename to release/7-3-Copy/alpine315/test-deps/docker/Dockerfile
diff --git a/release/7-3/alpine315/test-deps/meta.json b/release/7-3-Copy/alpine315/test-deps/meta.json
similarity index 100%
rename from release/7-3/alpine315/test-deps/meta.json
rename to release/7-3-Copy/alpine315/test-deps/meta.json
diff --git a/release/7-3/debian10/docker/Dockerfile b/release/7-3-Copy/debian10/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian10/docker/Dockerfile
rename to release/7-3-Copy/debian10/docker/Dockerfile
diff --git a/release/7-3/debian10/meta.json b/release/7-3-Copy/debian10/meta.json
similarity index 100%
rename from release/7-3/debian10/meta.json
rename to release/7-3-Copy/debian10/meta.json
diff --git a/release/7-3/debian10/test-deps/docker/Dockerfile b/release/7-3-Copy/debian10/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian10/test-deps/docker/Dockerfile
rename to release/7-3-Copy/debian10/test-deps/docker/Dockerfile
diff --git a/release/7-3/debian10/test-deps/meta.json b/release/7-3-Copy/debian10/test-deps/meta.json
similarity index 100%
rename from release/7-3/debian10/test-deps/meta.json
rename to release/7-3-Copy/debian10/test-deps/meta.json
diff --git a/release/7-3/debian11/docker/Dockerfile b/release/7-3-Copy/debian11/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian11/docker/Dockerfile
rename to release/7-3-Copy/debian11/docker/Dockerfile
diff --git a/release/7-3/debian11/meta.json b/release/7-3-Copy/debian11/meta.json
similarity index 100%
rename from release/7-3/debian11/meta.json
rename to release/7-3-Copy/debian11/meta.json
diff --git a/release/7-3/debian11/test-deps/docker/Dockerfile b/release/7-3-Copy/debian11/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/debian11/test-deps/docker/Dockerfile
rename to release/7-3-Copy/debian11/test-deps/docker/Dockerfile
diff --git a/release/7-3/debian11/test-deps/meta.json b/release/7-3-Copy/debian11/test-deps/meta.json
similarity index 100%
rename from release/7-3/debian11/test-deps/meta.json
rename to release/7-3-Copy/debian11/test-deps/meta.json
diff --git a/release/7-3/mariner2/docker/Dockerfile b/release/7-3-Copy/mariner2/docker/Dockerfile
similarity index 100%
rename from release/7-3/mariner2/docker/Dockerfile
rename to release/7-3-Copy/mariner2/docker/Dockerfile
diff --git a/release/7-3/mariner2/meta.json b/release/7-3-Copy/mariner2/meta.json
similarity index 100%
rename from release/7-3/mariner2/meta.json
rename to release/7-3-Copy/mariner2/meta.json
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3-Copy/mariner2/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/mariner2/test-deps/docker/Dockerfile
rename to release/7-3-Copy/mariner2/test-deps/docker/Dockerfile
diff --git a/release/7-3/mariner2/test-deps/meta.json b/release/7-3-Copy/mariner2/test-deps/meta.json
similarity index 100%
rename from release/7-3/mariner2/test-deps/meta.json
rename to release/7-3-Copy/mariner2/test-deps/meta.json
diff --git a/release/7-3/nanoserver1809/docker/Dockerfile b/release/7-3-Copy/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/7-3/nanoserver1809/docker/Dockerfile
rename to release/7-3-Copy/nanoserver1809/docker/Dockerfile
diff --git a/release/7-3/nanoserver1809/meta.json b/release/7-3-Copy/nanoserver1809/meta.json
similarity index 100%
rename from release/7-3/nanoserver1809/meta.json
rename to release/7-3-Copy/nanoserver1809/meta.json
diff --git a/release/7-3/nanoserver2022/docker/Dockerfile b/release/7-3-Copy/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/nanoserver2022/docker/Dockerfile
rename to release/7-3-Copy/nanoserver2022/docker/Dockerfile
diff --git a/release/7-3/nanoserver2022/meta.json b/release/7-3-Copy/nanoserver2022/meta.json
similarity index 100%
rename from release/7-3/nanoserver2022/meta.json
rename to release/7-3-Copy/nanoserver2022/meta.json
diff --git a/release/7-3/ubi8/docker/Dockerfile b/release/7-3-Copy/ubi8/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi8/docker/Dockerfile
rename to release/7-3-Copy/ubi8/docker/Dockerfile
diff --git a/release/7-3/ubi8/meta.json b/release/7-3-Copy/ubi8/meta.json
similarity index 100%
rename from release/7-3/ubi8/meta.json
rename to release/7-3-Copy/ubi8/meta.json
diff --git a/release/7-3/ubi8/test-deps/docker/Dockerfile b/release/7-3-Copy/ubi8/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi8/test-deps/docker/Dockerfile
rename to release/7-3-Copy/ubi8/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubi8/test-deps/meta.json b/release/7-3-Copy/ubi8/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubi8/test-deps/meta.json
rename to release/7-3-Copy/ubi8/test-deps/meta.json
diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3-Copy/ubi9/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi9/docker/Dockerfile
rename to release/7-3-Copy/ubi9/docker/Dockerfile
diff --git a/release/7-3/ubi9/meta.json b/release/7-3-Copy/ubi9/meta.json
similarity index 100%
rename from release/7-3/ubi9/meta.json
rename to release/7-3-Copy/ubi9/meta.json
diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-3-Copy/ubi9/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubi9/test-deps/docker/Dockerfile
rename to release/7-3-Copy/ubi9/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubi9/test-deps/meta.json b/release/7-3-Copy/ubi9/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubi9/test-deps/meta.json
rename to release/7-3-Copy/ubi9/test-deps/meta.json
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-3-Copy/ubuntu20.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
rename to release/7-3-Copy/ubuntu20.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3-Copy/ubuntu20.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04-arm32v7/meta.json
rename to release/7-3-Copy/ubuntu20.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu20.04/docker/Dockerfile b/release/7-3-Copy/ubuntu20.04/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04/docker/Dockerfile
rename to release/7-3-Copy/ubuntu20.04/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04/meta.json b/release/7-3-Copy/ubuntu20.04/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04/meta.json
rename to release/7-3-Copy/ubuntu20.04/meta.json
diff --git a/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-3-Copy/ubuntu20.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
rename to release/7-3-Copy/ubuntu20.04/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubuntu20.04/test-deps/meta.json b/release/7-3-Copy/ubuntu20.04/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubuntu20.04/test-deps/meta.json
rename to release/7-3-Copy/ubuntu20.04/test-deps/meta.json
diff --git a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-3-Copy/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/7-3-Copy/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3-Copy/ubuntu22.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04-arm32v7/meta.json
rename to release/7-3-Copy/ubuntu22.04-arm32v7/meta.json
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-3-Copy/ubuntu22.04/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04/docker/Dockerfile
rename to release/7-3-Copy/ubuntu22.04/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3-Copy/ubuntu22.04/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04/meta.json
rename to release/7-3-Copy/ubuntu22.04/meta.json
diff --git a/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-3-Copy/ubuntu22.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
rename to release/7-3-Copy/ubuntu22.04/test-deps/docker/Dockerfile
diff --git a/release/7-3/ubuntu22.04/test-deps/meta.json b/release/7-3-Copy/ubuntu22.04/test-deps/meta.json
similarity index 100%
rename from release/7-3/ubuntu22.04/test-deps/meta.json
rename to release/7-3-Copy/ubuntu22.04/test-deps/meta.json
diff --git a/release/7-3/windowsserver2022/docker/Dockerfile b/release/7-3-Copy/windowsserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/windowsserver2022/docker/Dockerfile
rename to release/7-3-Copy/windowsserver2022/docker/Dockerfile
diff --git a/release/7-3/windowsserver2022/meta.json b/release/7-3-Copy/windowsserver2022/meta.json
similarity index 100%
rename from release/7-3/windowsserver2022/meta.json
rename to release/7-3-Copy/windowsserver2022/meta.json
diff --git a/release/7-3/windowsservercore2022/docker/Dockerfile b/release/7-3-Copy/windowsservercore2022/docker/Dockerfile
similarity index 100%
rename from release/7-3/windowsservercore2022/docker/Dockerfile
rename to release/7-3-Copy/windowsservercore2022/docker/Dockerfile
diff --git a/release/7-3/windowsservercore2022/meta.json b/release/7-3-Copy/windowsservercore2022/meta.json
similarity index 100%
rename from release/7-3/windowsservercore2022/meta.json
rename to release/7-3-Copy/windowsservercore2022/meta.json

From 9416924ab524e8c4ae4b5839073ed01aa92fa615 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Tue, 20 Dec 2022 14:58:51 -0800
Subject: [PATCH 263/354] move 7-3-copy back to 7-3

---
 release/{7-3-Copy => 7-3}/alpine314/docker/Dockerfile             | 0
 release/{7-3-Copy => 7-3}/alpine314/meta.json                     | 0
 release/{7-3-Copy => 7-3}/alpine314/test-deps/docker/Dockerfile   | 0
 release/{7-3-Copy => 7-3}/alpine314/test-deps/meta.json           | 0
 release/{7-3-Copy => 7-3}/alpine315/docker/Dockerfile             | 0
 release/{7-3-Copy => 7-3}/alpine315/meta.json                     | 0
 release/{7-3-Copy => 7-3}/alpine315/test-deps/docker/Dockerfile   | 0
 release/{7-3-Copy => 7-3}/alpine315/test-deps/meta.json           | 0
 release/{7-3-Copy => 7-3}/debian10/docker/Dockerfile              | 0
 release/{7-3-Copy => 7-3}/debian10/meta.json                      | 0
 release/{7-3-Copy => 7-3}/debian10/test-deps/docker/Dockerfile    | 0
 release/{7-3-Copy => 7-3}/debian10/test-deps/meta.json            | 0
 release/{7-3-Copy => 7-3}/debian11/docker/Dockerfile              | 0
 release/{7-3-Copy => 7-3}/debian11/meta.json                      | 0
 release/{7-3-Copy => 7-3}/debian11/test-deps/docker/Dockerfile    | 0
 release/{7-3-Copy => 7-3}/debian11/test-deps/meta.json            | 0
 release/{7-3-Copy => 7-3}/mariner2/docker/Dockerfile              | 0
 release/{7-3-Copy => 7-3}/mariner2/meta.json                      | 0
 release/{7-3-Copy => 7-3}/mariner2/test-deps/docker/Dockerfile    | 0
 release/{7-3-Copy => 7-3}/mariner2/test-deps/meta.json            | 0
 release/{7-3-Copy => 7-3}/nanoserver1809/docker/Dockerfile        | 0
 release/{7-3-Copy => 7-3}/nanoserver1809/meta.json                | 0
 release/{7-3-Copy => 7-3}/nanoserver2022/docker/Dockerfile        | 0
 release/{7-3-Copy => 7-3}/nanoserver2022/meta.json                | 0
 release/{7-3-Copy => 7-3}/ubi8/docker/Dockerfile                  | 0
 release/{7-3-Copy => 7-3}/ubi8/meta.json                          | 0
 release/{7-3-Copy => 7-3}/ubi8/test-deps/docker/Dockerfile        | 0
 release/{7-3-Copy => 7-3}/ubi8/test-deps/meta.json                | 0
 release/{7-3-Copy => 7-3}/ubi9/docker/Dockerfile                  | 0
 release/{7-3-Copy => 7-3}/ubi9/meta.json                          | 0
 release/{7-3-Copy => 7-3}/ubi9/test-deps/docker/Dockerfile        | 0
 release/{7-3-Copy => 7-3}/ubi9/test-deps/meta.json                | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04-arm32v7/meta.json           | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04/docker/Dockerfile           | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04/meta.json                   | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04/test-deps/docker/Dockerfile | 0
 release/{7-3-Copy => 7-3}/ubuntu20.04/test-deps/meta.json         | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04-arm32v7/docker/Dockerfile   | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04-arm32v7/meta.json           | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04/docker/Dockerfile           | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04/meta.json                   | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04/test-deps/docker/Dockerfile | 0
 release/{7-3-Copy => 7-3}/ubuntu22.04/test-deps/meta.json         | 0
 release/{7-3-Copy => 7-3}/windowsserver2022/docker/Dockerfile     | 0
 release/{7-3-Copy => 7-3}/windowsserver2022/meta.json             | 0
 release/{7-3-Copy => 7-3}/windowsservercore2022/docker/Dockerfile | 0
 release/{7-3-Copy => 7-3}/windowsservercore2022/meta.json         | 0
 48 files changed, 0 insertions(+), 0 deletions(-)
 rename release/{7-3-Copy => 7-3}/alpine314/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/alpine314/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/alpine314/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/alpine314/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/alpine315/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/alpine315/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/alpine315/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/alpine315/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/debian10/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/debian10/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/debian10/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/debian10/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/debian11/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/debian11/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/debian11/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/debian11/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/mariner2/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/mariner2/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/mariner2/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/mariner2/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/nanoserver1809/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/nanoserver1809/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/nanoserver2022/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/nanoserver2022/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubi8/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubi8/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubi8/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubi8/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubi9/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubi9/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubi9/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubi9/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04-arm32v7/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu20.04/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04-arm32v7/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04-arm32v7/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04/test-deps/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/ubuntu22.04/test-deps/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/windowsserver2022/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/windowsserver2022/meta.json (100%)
 rename release/{7-3-Copy => 7-3}/windowsservercore2022/docker/Dockerfile (100%)
 rename release/{7-3-Copy => 7-3}/windowsservercore2022/meta.json (100%)

diff --git a/release/7-3-Copy/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/alpine314/docker/Dockerfile
rename to release/7-3/alpine314/docker/Dockerfile
diff --git a/release/7-3-Copy/alpine314/meta.json b/release/7-3/alpine314/meta.json
similarity index 100%
rename from release/7-3-Copy/alpine314/meta.json
rename to release/7-3/alpine314/meta.json
diff --git a/release/7-3-Copy/alpine314/test-deps/docker/Dockerfile b/release/7-3/alpine314/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/alpine314/test-deps/docker/Dockerfile
rename to release/7-3/alpine314/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/alpine314/test-deps/meta.json b/release/7-3/alpine314/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/alpine314/test-deps/meta.json
rename to release/7-3/alpine314/test-deps/meta.json
diff --git a/release/7-3-Copy/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/alpine315/docker/Dockerfile
rename to release/7-3/alpine315/docker/Dockerfile
diff --git a/release/7-3-Copy/alpine315/meta.json b/release/7-3/alpine315/meta.json
similarity index 100%
rename from release/7-3-Copy/alpine315/meta.json
rename to release/7-3/alpine315/meta.json
diff --git a/release/7-3-Copy/alpine315/test-deps/docker/Dockerfile b/release/7-3/alpine315/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/alpine315/test-deps/docker/Dockerfile
rename to release/7-3/alpine315/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/alpine315/test-deps/meta.json b/release/7-3/alpine315/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/alpine315/test-deps/meta.json
rename to release/7-3/alpine315/test-deps/meta.json
diff --git a/release/7-3-Copy/debian10/docker/Dockerfile b/release/7-3/debian10/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/debian10/docker/Dockerfile
rename to release/7-3/debian10/docker/Dockerfile
diff --git a/release/7-3-Copy/debian10/meta.json b/release/7-3/debian10/meta.json
similarity index 100%
rename from release/7-3-Copy/debian10/meta.json
rename to release/7-3/debian10/meta.json
diff --git a/release/7-3-Copy/debian10/test-deps/docker/Dockerfile b/release/7-3/debian10/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/debian10/test-deps/docker/Dockerfile
rename to release/7-3/debian10/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/debian10/test-deps/meta.json b/release/7-3/debian10/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/debian10/test-deps/meta.json
rename to release/7-3/debian10/test-deps/meta.json
diff --git a/release/7-3-Copy/debian11/docker/Dockerfile b/release/7-3/debian11/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/debian11/docker/Dockerfile
rename to release/7-3/debian11/docker/Dockerfile
diff --git a/release/7-3-Copy/debian11/meta.json b/release/7-3/debian11/meta.json
similarity index 100%
rename from release/7-3-Copy/debian11/meta.json
rename to release/7-3/debian11/meta.json
diff --git a/release/7-3-Copy/debian11/test-deps/docker/Dockerfile b/release/7-3/debian11/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/debian11/test-deps/docker/Dockerfile
rename to release/7-3/debian11/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/debian11/test-deps/meta.json b/release/7-3/debian11/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/debian11/test-deps/meta.json
rename to release/7-3/debian11/test-deps/meta.json
diff --git a/release/7-3-Copy/mariner2/docker/Dockerfile b/release/7-3/mariner2/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/mariner2/docker/Dockerfile
rename to release/7-3/mariner2/docker/Dockerfile
diff --git a/release/7-3-Copy/mariner2/meta.json b/release/7-3/mariner2/meta.json
similarity index 100%
rename from release/7-3-Copy/mariner2/meta.json
rename to release/7-3/mariner2/meta.json
diff --git a/release/7-3-Copy/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/mariner2/test-deps/docker/Dockerfile
rename to release/7-3/mariner2/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/mariner2/test-deps/meta.json b/release/7-3/mariner2/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/mariner2/test-deps/meta.json
rename to release/7-3/mariner2/test-deps/meta.json
diff --git a/release/7-3-Copy/nanoserver1809/docker/Dockerfile b/release/7-3/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/nanoserver1809/docker/Dockerfile
rename to release/7-3/nanoserver1809/docker/Dockerfile
diff --git a/release/7-3-Copy/nanoserver1809/meta.json b/release/7-3/nanoserver1809/meta.json
similarity index 100%
rename from release/7-3-Copy/nanoserver1809/meta.json
rename to release/7-3/nanoserver1809/meta.json
diff --git a/release/7-3-Copy/nanoserver2022/docker/Dockerfile b/release/7-3/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/nanoserver2022/docker/Dockerfile
rename to release/7-3/nanoserver2022/docker/Dockerfile
diff --git a/release/7-3-Copy/nanoserver2022/meta.json b/release/7-3/nanoserver2022/meta.json
similarity index 100%
rename from release/7-3-Copy/nanoserver2022/meta.json
rename to release/7-3/nanoserver2022/meta.json
diff --git a/release/7-3-Copy/ubi8/docker/Dockerfile b/release/7-3/ubi8/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubi8/docker/Dockerfile
rename to release/7-3/ubi8/docker/Dockerfile
diff --git a/release/7-3-Copy/ubi8/meta.json b/release/7-3/ubi8/meta.json
similarity index 100%
rename from release/7-3-Copy/ubi8/meta.json
rename to release/7-3/ubi8/meta.json
diff --git a/release/7-3-Copy/ubi8/test-deps/docker/Dockerfile b/release/7-3/ubi8/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubi8/test-deps/docker/Dockerfile
rename to release/7-3/ubi8/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/ubi8/test-deps/meta.json b/release/7-3/ubi8/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/ubi8/test-deps/meta.json
rename to release/7-3/ubi8/test-deps/meta.json
diff --git a/release/7-3-Copy/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubi9/docker/Dockerfile
rename to release/7-3/ubi9/docker/Dockerfile
diff --git a/release/7-3-Copy/ubi9/meta.json b/release/7-3/ubi9/meta.json
similarity index 100%
rename from release/7-3-Copy/ubi9/meta.json
rename to release/7-3/ubi9/meta.json
diff --git a/release/7-3-Copy/ubi9/test-deps/docker/Dockerfile b/release/7-3/ubi9/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubi9/test-deps/docker/Dockerfile
rename to release/7-3/ubi9/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/ubi9/test-deps/meta.json b/release/7-3/ubi9/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/ubi9/test-deps/meta.json
rename to release/7-3/ubi9/test-deps/meta.json
diff --git a/release/7-3-Copy/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04-arm32v7/docker/Dockerfile
rename to release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04-arm32v7/meta.json
rename to release/7-3/ubuntu20.04-arm32v7/meta.json
diff --git a/release/7-3-Copy/ubuntu20.04/docker/Dockerfile b/release/7-3/ubuntu20.04/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04/docker/Dockerfile
rename to release/7-3/ubuntu20.04/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu20.04/meta.json b/release/7-3/ubuntu20.04/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04/meta.json
rename to release/7-3/ubuntu20.04/meta.json
diff --git a/release/7-3-Copy/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04/test-deps/docker/Dockerfile
rename to release/7-3/ubuntu20.04/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu20.04/test-deps/meta.json b/release/7-3/ubuntu20.04/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu20.04/test-deps/meta.json
rename to release/7-3/ubuntu20.04/test-deps/meta.json
diff --git a/release/7-3-Copy/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04-arm32v7/docker/Dockerfile
rename to release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04-arm32v7/meta.json
rename to release/7-3/ubuntu22.04-arm32v7/meta.json
diff --git a/release/7-3-Copy/ubuntu22.04/docker/Dockerfile b/release/7-3/ubuntu22.04/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04/docker/Dockerfile
rename to release/7-3/ubuntu22.04/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04/meta.json
rename to release/7-3/ubuntu22.04/meta.json
diff --git a/release/7-3-Copy/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04/test-deps/docker/Dockerfile
rename to release/7-3/ubuntu22.04/test-deps/docker/Dockerfile
diff --git a/release/7-3-Copy/ubuntu22.04/test-deps/meta.json b/release/7-3/ubuntu22.04/test-deps/meta.json
similarity index 100%
rename from release/7-3-Copy/ubuntu22.04/test-deps/meta.json
rename to release/7-3/ubuntu22.04/test-deps/meta.json
diff --git a/release/7-3-Copy/windowsserver2022/docker/Dockerfile b/release/7-3/windowsserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/windowsserver2022/docker/Dockerfile
rename to release/7-3/windowsserver2022/docker/Dockerfile
diff --git a/release/7-3-Copy/windowsserver2022/meta.json b/release/7-3/windowsserver2022/meta.json
similarity index 100%
rename from release/7-3-Copy/windowsserver2022/meta.json
rename to release/7-3/windowsserver2022/meta.json
diff --git a/release/7-3-Copy/windowsservercore2022/docker/Dockerfile b/release/7-3/windowsservercore2022/docker/Dockerfile
similarity index 100%
rename from release/7-3-Copy/windowsservercore2022/docker/Dockerfile
rename to release/7-3/windowsservercore2022/docker/Dockerfile
diff --git a/release/7-3-Copy/windowsservercore2022/meta.json b/release/7-3/windowsservercore2022/meta.json
similarity index 100%
rename from release/7-3-Copy/windowsservercore2022/meta.json
rename to release/7-3/windowsservercore2022/meta.json

From 4e2a4c58aaa7051e792b3b3ac4b1d188f984c276 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Tue, 20 Dec 2022 14:13:39 -0800
Subject: [PATCH 264/354] change preview to use 7-4

---
 tools/buildHelper/channels.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index 8e5e73bf2..f42d923a4 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -7,7 +7,7 @@
     },
     {
         "name": "preview",
-        "path": "release/7-3",
+        "path": "release/7-4",
         "tagPrefix": "preview",
         "pwshInstallVersion": "7-preview",
         "packageTag": "-preview"

From 9f48a7b365b54d75627077f4e2cbb746656233c0 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Tue, 20 Dec 2022 15:00:40 -0800
Subject: [PATCH 265/354] make 7-4 nanoserver unstable

---
 release/{ => unstable}/7-4/nanoserver1809/docker/Dockerfile | 0
 release/{ => unstable}/7-4/nanoserver1809/meta.json         | 0
 release/{ => unstable}/7-4/nanoserver2022/docker/Dockerfile | 0
 release/{ => unstable}/7-4/nanoserver2022/meta.json         | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename release/{ => unstable}/7-4/nanoserver1809/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-4/nanoserver1809/meta.json (100%)
 rename release/{ => unstable}/7-4/nanoserver2022/docker/Dockerfile (100%)
 rename release/{ => unstable}/7-4/nanoserver2022/meta.json (100%)

diff --git a/release/7-4/nanoserver1809/docker/Dockerfile b/release/unstable/7-4/nanoserver1809/docker/Dockerfile
similarity index 100%
rename from release/7-4/nanoserver1809/docker/Dockerfile
rename to release/unstable/7-4/nanoserver1809/docker/Dockerfile
diff --git a/release/7-4/nanoserver1809/meta.json b/release/unstable/7-4/nanoserver1809/meta.json
similarity index 100%
rename from release/7-4/nanoserver1809/meta.json
rename to release/unstable/7-4/nanoserver1809/meta.json
diff --git a/release/7-4/nanoserver2022/docker/Dockerfile b/release/unstable/7-4/nanoserver2022/docker/Dockerfile
similarity index 100%
rename from release/7-4/nanoserver2022/docker/Dockerfile
rename to release/unstable/7-4/nanoserver2022/docker/Dockerfile
diff --git a/release/7-4/nanoserver2022/meta.json b/release/unstable/7-4/nanoserver2022/meta.json
similarity index 100%
rename from release/7-4/nanoserver2022/meta.json
rename to release/unstable/7-4/nanoserver2022/meta.json

From ef3aa0303b7c3e1862a34edc543357cc32d289d5 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 10 Jan 2023 14:13:15 -0500
Subject: [PATCH 266/354] add mariner arm64 image (#727)

---
 .vsts-ci/phase.yml                           | 43 ++++++------
 release/7-3/mariner2-arm64/docker/Dockerfile | 73 ++++++++++++++++++++
 release/7-3/mariner2-arm64/meta.json         | 21 ++++++
 3 files changed, 116 insertions(+), 21 deletions(-)
 create mode 100644 release/7-3/mariner2-arm64/docker/Dockerfile
 create mode 100644 release/7-3/mariner2-arm64/meta.json

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index 344de19d6..b90817421 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -91,10 +91,31 @@ jobs:
     displayName: 'Capture Docker* Environment Variables'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
+  - pwsh: |
+      if ( '$env:CHANNEL' -eq '' ) { exit }
+      $files = @(Get-ChildItem -Recurse test*.xml)
+      if($files.count -eq 0) {
+        throw 'no test results found'
+      }
+    displayName: Make sure we got test results
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+    continueOnError: ${{ variables.continueonerror }}
+
+  - task: PublishTestResults@2
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],''))
+    displayName: Publish $(ImageName) Test Results **\test*.xml
+    continueOnError: ${{ variables.continueonerror }}
+
+    inputs:
+      testRunner: NUnit
+      testResultsFiles: '**\test*.xml'
+      testRunTitle: $(ImageName)
+      mergeTestResults: true
+
   - task: UseDotNet@2
     inputs:
       packageType: 'sdk'
-      version: 6.x
+      version: 7.x
 
   - pwsh: |
       dotnet --list-sdks
@@ -115,23 +136,3 @@ jobs:
           ne(variables['Channel'],'')
         )
 
-  - pwsh: |
-      if ( '$env:CHANNEL' -eq '' ) { exit }
-      $files = @(Get-ChildItem -Recurse test*.xml)
-      if($files.count -eq 0) {
-        throw 'no test results found'
-      }
-    displayName: Make sure we got test results
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-    continueOnError: ${{ variables.continueonerror }}
-
-  - task: PublishTestResults@2
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],''))
-    displayName: Publish $(ImageName) Test Results **\test*.xml
-    continueOnError: ${{ variables.continueonerror }}
-
-    inputs:
-      testRunner: NUnit
-      testResultsFiles: '**\test*.xml'
-      testRunTitle: $(ImageName)
-      mergeTestResults: true
diff --git a/release/7-3/mariner2-arm64/docker/Dockerfile b/release/7-3/mariner2-arm64/docker/Dockerfile
new file mode 100644
index 000000000..52e3e6a49
--- /dev/null
+++ b/release/7-3/mariner2-arm64/docker/Dockerfile
@@ -0,0 +1,73 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    && tdnf install -y ca-certificates wget tar
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+# Unzip the linux powershell.tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7
+ARG PS_VERSION=7.3.1
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    tdnf update -y \
+    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
+    && tdnf upgrade -y \
+    && tdnf clean all
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/mariner2-arm64/meta.json b/release/7-3/mariner2-arm64/meta.json
new file mode 100644
index 000000000..418d3850b
--- /dev/null
+++ b/release/7-3/mariner2-arm64/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-linux-arm64.tar.gz",
+    "osVersion": "Mariner 2.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "mariner",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "2.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "arm64": true
+    },
+    "EndOfLife": "2023-12-14",
+    "DistributionState": "Validating",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}

From d4da9b0bf114a96745d35caf1dc005ddc683c0eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 Jan 2023 17:31:24 +0000
Subject: [PATCH 267/354] Update the release build yaml with the latest
 versions (#724)

* Update the release build yaml with the latest versions

* Update .vsts-ci/releasebuild.yml

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index a17cf2b1d..4c34f1662 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.3.0-rc.1'
+    default: 'v7.4.0-preview.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.7'
+    default: 'v7.2.8'
   - name: 'stableReleaseTag'
-    default: 'v7.2.7'
+    default: 'v7.3.1'
 
 resources:
 - repo: self

From da52338d43297ea15e245cb3332857b795088aaf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 Jan 2023 11:22:11 -0800
Subject: [PATCH 268/354] Update the release build yaml with the latest
 versions (#731)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 4c34f1662..6fa5015d2 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.4.0-preview.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.8'
+    default: 'v7.2.9'
   - name: 'stableReleaseTag'
-    default: 'v7.3.1'
+    default: 'v7.3.2'
 
 resources:
 - repo: self

From b6a229d33cf23db0e4f1ca1d962f1de5b1db44a8 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Mon, 27 Feb 2023 14:22:16 -0800
Subject: [PATCH 269/354] Update the release build yaml with the latest
 versions (#734)

---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 6fa5015d2..d023712df 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,7 +4,7 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.4.0-preview.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.9'
+    default: 'v7.2.10'
   - name: 'stableReleaseTag'
     default: 'v7.3.2'
 

From 490024496189cb9ac02bb7b9fa3f84286e445073 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 27 Feb 2023 14:22:52 -0800
Subject: [PATCH 270/354] Start using ACR pull-through caching for dockerHub
 (#732)

---
 release/7-3/alpine314/docker/Dockerfile           | 6 ++++--
 release/7-3/alpine315/docker/Dockerfile           | 7 ++++---
 release/7-3/debian11/docker/Dockerfile            | 6 ++++--
 release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile | 6 ++++--
 release/7-3/ubuntu20.04/docker/Dockerfile         | 6 ++++--
 release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile | 7 +++++--
 release/7-3/ubuntu22.04/docker/Dockerfile         | 6 ++++--
 release/7-4/alpine314/docker/Dockerfile           | 6 ++++--
 release/7-4/alpine315/docker/Dockerfile           | 6 ++++--
 release/7-4/debian11/docker/Dockerfile            | 6 ++++--
 release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile | 6 ++++--
 release/7-4/ubuntu20.04/docker/Dockerfile         | 6 ++++--
 release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile | 6 ++++--
 release/7-4/ubuntu22.04/docker/Dockerfile         | 6 ++++--
 14 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
index fe5dc6cfb..f71f5afdc 100644
--- a/release/7-3/alpine314/docker/Dockerfile
+++ b/release/7-3/alpine314/docker/Dockerfile
@@ -3,7 +3,8 @@
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.14 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.14 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +25,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.14
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
index a13244bd4..0a2e2083f 100644
--- a/release/7-3/alpine315/docker/Dockerfile
+++ b/release/7-3/alpine315/docker/Dockerfile
@@ -2,8 +2,8 @@
 # Licensed under the MIT License.
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.15 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.15 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +24,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.15
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.15
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/7-3/debian11/docker/Dockerfile b/release/7-3/debian11/docker/Dockerfile
index 9437355b7..2abfd69a0 100644
--- a/release/7-3/debian11/docker/Dockerfile
+++ b/release/7-3/debian11/docker/Dockerfile
@@ -3,7 +3,8 @@
 
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 
-FROM debian:bullseye-slim AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +25,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim
 
 ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
index a871986d9..82537653b 100644
--- a/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
+++ b/release/7-3/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -1,7 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS installer-env
 
     ARG PS_VERSION=7.3.0-preview.3
     ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -32,7 +33,8 @@ FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
         # Unzip the Linux tar.gz
     RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS final-image
 
     # Define Args and Env needed to create links
     ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/ubuntu20.04/docker/Dockerfile b/release/7-3/ubuntu20.04/docker/Dockerfile
index 8190712b3..de0d3b08f 100644
--- a/release/7-3/ubuntu20.04/docker/Dockerfile
+++ b/release/7-3/ubuntu20.04/docker/Dockerfile
@@ -2,7 +2,8 @@
 # Licensed under the MIT License.
 
 # Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:20.04 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -25,7 +26,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ubuntu:20.04 AS powershell
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS powershell
 
 ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
index e22fcd460..b982223a2 100644
--- a/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
+++ b/release/7-3/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -1,7 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS installer-env
 
 ARG PS_VERSION=7.3.0-preview.4
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -30,7 +32,8 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM --platform=linux/arm/v7 ubuntu:jammy AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-3/ubuntu22.04/docker/Dockerfile b/release/7-3/ubuntu22.04/docker/Dockerfile
index 3a3617ae2..94ca415ee 100644
--- a/release/7-3/ubuntu22.04/docker/Dockerfile
+++ b/release/7-3/ubuntu22.04/docker/Dockerfile
@@ -2,7 +2,8 @@
 # Licensed under the MIT License.
 
 # Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:22.04 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -27,7 +28,8 @@ RUN --mount=type=cache,target=/var/lib/apt \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
 
 # Install the deb file in this image and make powershell available
-FROM ubuntu:22.04 AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS final-image
 
 # # Define args needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
diff --git a/release/7-4/alpine314/docker/Dockerfile b/release/7-4/alpine314/docker/Dockerfile
index fe5dc6cfb..f71f5afdc 100644
--- a/release/7-4/alpine314/docker/Dockerfile
+++ b/release/7-4/alpine314/docker/Dockerfile
@@ -3,7 +3,8 @@
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.14 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.14 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +25,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.14
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/7-4/alpine315/docker/Dockerfile b/release/7-4/alpine315/docker/Dockerfile
index a13244bd4..40042d5ab 100644
--- a/release/7-4/alpine315/docker/Dockerfile
+++ b/release/7-4/alpine315/docker/Dockerfile
@@ -3,7 +3,8 @@
 
 # Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
 
-FROM alpine:3.15 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.15 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +25,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.15
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.15
 
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
diff --git a/release/7-4/debian11/docker/Dockerfile b/release/7-4/debian11/docker/Dockerfile
index 9437355b7..2abfd69a0 100644
--- a/release/7-4/debian11/docker/Dockerfile
+++ b/release/7-4/debian11/docker/Dockerfile
@@ -3,7 +3,8 @@
 
 # Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
 
-FROM debian:bullseye-slim AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -24,7 +25,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim
 
 ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile
index a871986d9..82537653b 100644
--- a/release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile
+++ b/release/7-4/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -1,7 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS installer-env
 
     ARG PS_VERSION=7.3.0-preview.3
     ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -32,7 +33,8 @@ FROM --platform=linux/arm/v7 ubuntu:focal AS installer-env
         # Unzip the Linux tar.gz
     RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM --platform=linux/arm/v7 ubuntu:focal AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS final-image
 
     # Define Args and Env needed to create links
     ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-4/ubuntu20.04/docker/Dockerfile b/release/7-4/ubuntu20.04/docker/Dockerfile
index 8190712b3..de0d3b08f 100644
--- a/release/7-4/ubuntu20.04/docker/Dockerfile
+++ b/release/7-4/ubuntu20.04/docker/Dockerfile
@@ -2,7 +2,8 @@
 # Licensed under the MIT License.
 
 # Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:20.04 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -25,7 +26,8 @@ RUN mkdir -p ${PS_INSTALL_FOLDER}
 RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM ubuntu:20.04 AS powershell
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS powershell
 
 ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile
index e22fcd460..01779bf8d 100644
--- a/release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile
+++ b/release/7-4/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -1,7 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm/v7 ubuntu:jammy AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS installer-env
 
 ARG PS_VERSION=7.3.0-preview.4
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -30,7 +31,8 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM --platform=linux/arm/v7 ubuntu:jammy AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview
diff --git a/release/7-4/ubuntu22.04/docker/Dockerfile b/release/7-4/ubuntu22.04/docker/Dockerfile
index 3a3617ae2..94ca415ee 100644
--- a/release/7-4/ubuntu22.04/docker/Dockerfile
+++ b/release/7-4/ubuntu22.04/docker/Dockerfile
@@ -2,7 +2,8 @@
 # Licensed under the MIT License.
 
 # Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:22.04 AS installer-env
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -27,7 +28,8 @@ RUN --mount=type=cache,target=/var/lib/apt \
     && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
 
 # Install the deb file in this image and make powershell available
-FROM ubuntu:22.04 AS final-image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS final-image
 
 # # Define args needed to add the package
 ARG PS_VERSION=7.3.0-preview.8

From 3b26b6c802c0390d83c844d6870e8f8ae43c43fc Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 27 Feb 2023 14:50:13 -0800
Subject: [PATCH 271/354] Create scorecard workflow (#736)

* Create .github/workflows/scorecard.yml

* Update scorecard.yml
---
 .github/workflows/scorecard.yml | 74 +++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 .github/workflows/scorecard.yml

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 000000000..ef6b0168a
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,74 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '28 9 * * 3'
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: false
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        with:
+          sarif_file: results.sarif

From edae63fde4984f33bb38fd66573bc2a9c0949f61 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 27 Feb 2023 15:43:44 -0800
Subject: [PATCH 272/354] Use pwshBot account to allow PR creation in GitHub
 Workflow (#733)

* Update update.yml

* Update update.yml

* Update update.yml

* Update update.yml

* Update update.yml

* Update update.yml

* Fix code scanning issues

* Update update.yml
---
 .github/workflows/createReminder.yml   |  3 ++
 .github/workflows/processReminders.yml |  3 ++
 .github/workflows/rebase.yml           |  4 +++
 .github/workflows/update.yml           | 44 ++++++++++++--------------
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/createReminder.yml b/.github/workflows/createReminder.yml
index b779e19d5..79f8a30bb 100644
--- a/.github/workflows/createReminder.yml
+++ b/.github/workflows/createReminder.yml
@@ -1,5 +1,8 @@
 name: 'Create reminder'
 
+permissions:
+  contents: read
+
 on:
   issue_comment:
     types: [created, edited]
diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
index 65322ebd7..9bf1a17a6 100644
--- a/.github/workflows/processReminders.yml
+++ b/.github/workflows/processReminders.yml
@@ -1,5 +1,8 @@
 name: 'Process reminders'
 
+permissions:
+  contents: read
+
 on:
   schedule:
     - cron: '*/15 * * * *'
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index f610e1b53..2114de9b3 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -4,6 +4,10 @@
 on:
   issue_comment:
     types: [created]
+
+permissions:
+  contents: read
+
 name: Automatic Rebase
 jobs:
   rebase:
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 5de410d27..df911b167 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -1,19 +1,13 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
-name: Update Release Build Parameters
+name: Daily Updates
+
+permissions:
+  contents: read
 
 on:
   workflow_dispatch:
-  push:
-    paths:
-      - '.github/workflows/update.yml'
-    branches:
-      - master
-      - add-gh-action
-  pull_request:
-    paths:
-      - '.github/workflows/update.yml'
   schedule:
     # At 20:20 UTC on every day-of-week from Monday through Friday.
     - cron:  '0 0/4 * * *'
@@ -27,6 +21,9 @@ jobs:
     name: Update Release Build Parameters
     timeout-minutes: 15
     runs-on: ubuntu-20.04
+    permissions:
+      pull-requests: write
+      contents: write  # for peter-evans/create-pull-request to create branch
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -37,23 +34,24 @@ jobs:
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
-        uses: peter-evans/create-pull-request@v3
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        uses: peter-evans/create-pull-request@v4
         with:
+          token: "${{ secrets.PR_PAT }}"
           commit-message: "Update the release build yaml with the latest versions"
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          committer: PwshBot <pwshbot@microsoft.com>
+          author: PwshBot <pwshbot@microsoft.com>
           title: "Update the release build yaml with the latest versions"
-          assignees: travisez13
-          reviewers: travisez13
           base: master
           draft: false
           branch: update-release-build
+          push-to-fork: pwshBot/PowerShell-Docker
   update-matrix-json:
     name: Update Matrix Json
     timeout-minutes: 15
     runs-on: ubuntu-20.04
+    permissions:
+      pull-requests: write
+      contents: write  # for peter-evans/create-pull-request to create branch
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -70,16 +68,14 @@ jobs:
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
-        uses: peter-evans/create-pull-request@v3
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        uses: peter-evans/create-pull-request@v4
         with:
+          token: "${{ secrets.PR_PAT }}"
           commit-message: "Update the matrix json"
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          committer: PwshBot <pwshbot@microsoft.com>
+          author: PwshBot <pwshbot@microsoft.com>
           title: "Update the matrix json"
-          assignees: travisez13
-          reviewers: travisez13
           base: master
           draft: false
           branch: update-matrix-json
+          push-to-fork: pwshBot/PowerShell-Docker

From 3a08ddb28b789ed23c1e3e51893e3bfaae62eafd Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 28 Feb 2023 16:48:52 -0500
Subject: [PATCH 273/354] Add arm image support for release (#729)

---
 .vsts-ci/releasePhase.yml                     | 61 +++++++++++++++----
 .vsts-ci/releaseStage.yml                     | 16 ++---
 .vsts-ci/releasebuild.yml                     |  2 +-
 .../templatesReleasePipeline/releaseStage.yml | 16 ++---
 4 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index 6c851da78..e282c8b11 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -26,10 +26,15 @@ jobs:
       matrix: $[ ${{ parameters.matrix }} ]
       maxParallel: ${{ parameters.maxParallel }}
   variables:
-    dockerImage: 'powershell'
-    ACR: ${{ parameters.ACR }}
-    releaseTag: ${{ parameters.releaseTag }}
-    scanType: Register
+  - name: dockerImage
+    value: 'powershell'
+  - name: ACR
+    value: ${{ parameters.ACR }}
+  - name: releaseTag
+    value: ${{ parameters.releaseTag }}
+  - name: scanType
+    value: Register
+  - group: Azure Blob Variable Group
 
   pool:
     name: ${{ parameters.pool }}
@@ -47,7 +52,7 @@ jobs:
   - task: UseDotNet@2
     inputs:
       packageType: 'sdk'
-      version: 6.x
+      version: 7.x
 
   - pwsh: |
       dotnet --list-sdks
@@ -99,15 +104,42 @@ jobs:
     displayName: 'docker login $(dockerHost)'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-  - pwsh: ' az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
+    
+  - pwsh: |
+      if($env:ACR -eq 'yes')
+      {
+        Write-Host 'Using ACR, will need to az login'
+        az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)
+      }
     displayName: 'az login'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      az account set --subscription $(StorageSubscriptionName)
-      $querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(1).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
-      $url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
-      Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
+      $modules = 'Az.Accounts', 'Az.Storage'
+      foreach ($module in $modules) {
+        if (!(Get-Module $module -listavailable)) {
+          Write-Host "installing $module..." -verbose
+          Install-Module $module -force -allowclobber
+        } else {
+          Write-Host "$module is already installed" -verbose
+        }
+      }
+    displayName: 'Install AzAccounts'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+
+  - task: AzurePowerShell@5
+    inputs:
+      azureSubscription: '$(AzureFileCopySubscription)'
+      scriptType: inlineScript
+      azurePowerShellVersion: latestVersion
+      pwsh: true
+      inline: |
+        $containerName = Out-String -InputObject $(DOCKERNAMESPACE) -NoNewline
+        $containerName = $containerName.Replace('.', '-')
+        $context = New-AzStorageContext -StorageAccountName $(StorageAccount)
+        $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
+        $url = "https://$(StorageAccount).blob.core.windows.net/$querystring"
+        Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
@@ -116,7 +148,6 @@ jobs:
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
-      az account set --subscription $(AcrSubscriptionName)
       $extraParams = @{}
       if($env:ACR -eq 'no')
       {
@@ -125,6 +156,7 @@ jobs:
       }
       else
       {
+        az account set --subscription $(AcrSubscriptionName)
         Write-Host 'Using ACR, will NOT test behavior...'
         $extraParams.Add('SkipTest',$true)
       }
@@ -153,7 +185,12 @@ jobs:
     displayName: 'docker logout'
     condition: and( always(), ne(variables['Channel'],''))
 
-  - pwsh: 'az logout'
+  - pwsh: | 
+      if($env:ACR -eq 'yes')
+      {
+        Write-Host 'Using ACR, will need to az logout'
+        az logout
+      }
     displayName: 'az logout'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 5bd192f94..5c7705d54 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -39,14 +39,14 @@ stages:
           - GenerateYaml_${{ parameters.channel }}
         jobName: Build_Linux_x64
 
-    # - template: releasePhase.yml
-    #   parameters:
-    #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
-    #     dependsOn:
-    #       - GenerateYaml_${{ parameters.channel }}
-    #     jobName: Build_Linux_arm
-    #     pool: PS-mscodehub-ARM
-    #     vmImage: PSMMSUbuntu20.04-ARM64-secure
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
+        dependsOn:
+          - GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Linux_arm
+        pool: PS-mscodehub-ARM
+        vmImage: PSMMSUbuntu20.04-ARM64-secure
 
     - template: releasePhase.yml
       parameters:
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index d023712df..352cd3ad4 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -6,7 +6,7 @@ parameters:
   - name: 'ltsReleaseTag'
     default: 'v7.2.10'
   - name: 'stableReleaseTag'
-    default: 'v7.3.2'
+    default: 'v7.3.3'
 
 resources:
 - repo: self
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index 80a90b7a0..554ed8881 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -57,14 +57,14 @@ stages:
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
-      # - template: ./releaseJob.yml
-      #   parameters:
-      #     jobName: ${{ parameters.channel }}_linux_arm
-      #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
-      #     WhatIf: ${{ parameters.WhatIf }}
-      #     vmImage: "PSMMSUbuntu20.04-Secure"
-      #     dependsOn:
-      #       - GenerateYaml_${{ parameters.channel }}
+      - template: ./releaseJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux_arm
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
+          WhatIf: ${{ parameters.WhatIf }}
+          vmImage: "PSMMSUbuntu20.04-Secure"
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
 
     - stage: Release_ManifestList_${{ parameters.channel }}
       jobs:

From 27d5372e2bae9c66b4638aa87f4f7216079edb50 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 28 Feb 2023 16:11:47 -0800
Subject: [PATCH 274/354] Delete rebase.yml

---
 .github/workflows/rebase.yml | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 .github/workflows/rebase.yml

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
deleted file mode 100644
index 2114de9b3..000000000
--- a/.github/workflows/rebase.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# This cannot rebase workflow changes into a PR
-# It also only works if the GITHUB_TOKEN has permission to push to the branch
-# see: https://github.com/cirrus-actions/rebase/issues/12#issuecomment-632594995
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-
-name: Automatic Rebase
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the latest code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Post rebase started comment to pull request
-      uses: actions/github-script@v3
-      with:
-        script: |
-          const backport_start_body = `Started rebase: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
-          await github.issues.createComment({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: backport_start_body
-          });
-    - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.6
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 289682ca7b29c9f12ec64fa639193ebcd02f0d31 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Fri, 3 Mar 2023 14:15:15 -0500
Subject: [PATCH 275/354] add job for linux arm tests during release (#738)

---
 .vsts-ci/templatesReleasePipeline/testStage.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index 291dae232..340314c40 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -51,10 +51,10 @@ stages:
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
 
-      # - template: ./testJob.yml
-      #   parameters:
-      #     jobName: ${{ parameters.channel }}_linux
-      #     matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
-      #     vmImage: ubuntu-latest
-      #     dependsOn:
-      #       - GenerateYaml_${{ parameters.channel }}
+      - template: ./testJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
+          vmImage: ubuntu-latest
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}

From 4e0d901c03a37e554a65b56981b10f2857912495 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 6 Mar 2023 18:59:51 -0500
Subject: [PATCH 276/354] Add Mariner arm64 preview image (#737)

* add mariner64 preview image

* remove comments

* Update release/7-4/mariner2-arm64/meta.json

---------

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 release/7-4/mariner2-arm64/docker/Dockerfile | 74 ++++++++++++++++++++
 release/7-4/mariner2-arm64/meta.json         | 21 ++++++
 2 files changed, 95 insertions(+)
 create mode 100644 release/7-4/mariner2-arm64/docker/Dockerfile
 create mode 100644 release/7-4/mariner2-arm64/meta.json

diff --git a/release/7-4/mariner2-arm64/docker/Dockerfile b/release/7-4/mariner2-arm64/docker/Dockerfile
new file mode 100644
index 000000000..de5c18ddc
--- /dev/null
+++ b/release/7-4/mariner2-arm64/docker/Dockerfile
@@ -0,0 +1,74 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.4.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    && tdnf install -y ca-certificates wget tar
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+# Unzip the linux powershell.tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.4.0-preview.1
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    tdnf update -y \
+    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
+    && tdnf upgrade -y \
+    && tdnf clean all
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/mariner2-arm64/meta.json b/release/7-4/mariner2-arm64/meta.json
new file mode 100644
index 000000000..c2faa5f89
--- /dev/null
+++ b/release/7-4/mariner2-arm64/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm64.tar.gz",
+    "osVersion": "Mariner 2.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "mariner",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "2.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "arm64": true
+    },
+    "EndOfLife": "2023-12-14",
+    "DistributionState": "Validating",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}

From bf2ea4f653b49b7ed738c8a96625701244acfd05 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 8 Mar 2023 16:41:17 -0500
Subject: [PATCH 277/354] Correctly specify platform and architecture for arm32
 images (#739)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
Co-authored-by: travis plunk <github@ez13.net>
---
 .vsts-ci/releaseStage.yml                          | 11 ++++++++++-
 .vsts-ci/stage.yml                                 | 10 +++++++++-
 .vsts-ci/templatesReleasePipeline/releaseStage.yml | 11 ++++++++++-
 .vsts-ci/templatesReleasePipeline/testStage.yml    |  9 +++++++++
 release/7-2/ubuntu18.04-arm32v7/meta.json          |  2 +-
 release/7-2/ubuntu20.04-arm32v7/meta.json          |  2 +-
 release/7-2/ubuntu22.04-arm32v7/meta.json          |  2 +-
 release/7-3/ubuntu20.04-arm32v7/meta.json          |  2 +-
 release/7-3/ubuntu22.04-arm32v7/meta.json          |  2 +-
 release/7-4/ubuntu20.04-arm32v7/meta.json          |  2 +-
 release/7-4/ubuntu22.04-arm32v7/meta.json          |  2 +-
 11 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index 5c7705d54..f19e9141f 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -44,10 +44,19 @@ stages:
         matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
         dependsOn:
           - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux_arm
+        jobName: Build_Linux_arm64
         pool: PS-mscodehub-ARM
         vmImage: PSMMSUbuntu20.04-ARM64-secure
 
+    - template: releasePhase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
+        dependsOn:
+          - GenerateYaml_${{ parameters.channel }}
+        jobName: Build_Linux_arm32
+        pool: PS-mscodehub-ARM
+        vmImage: PSMMSUbuntu20.04-ARM64-secure
+        
     - template: releasePhase.yml
       parameters:
         matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
diff --git a/.vsts-ci/stage.yml b/.vsts-ci/stage.yml
index bb2e7b807..26b69a9c4 100644
--- a/.vsts-ci/stage.yml
+++ b/.vsts-ci/stage.yml
@@ -43,7 +43,15 @@ stages:
       parameters:
         matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
         dependsOn: GenerateYaml_${{ variables.jobName }}
-        jobName: Build_Linux_ARM
+        jobName: Build_Linux_ARM64
+        useacr: ${{ parameters.useacr }}
+        pool: PS-PowerShell-ARM
+        vmImage: PSMMSUbuntu20.04-ARM64-secure
+    - template: phase.yml
+      parameters:
+        matrix: dependencies.GenerateYaml_${{ variables.jobName }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
+        dependsOn: GenerateYaml_${{ variables.jobName }}
+        jobName: Build_Linux_ARM32
         useacr: ${{ parameters.useacr }}
         pool: PS-PowerShell-ARM
         vmImage: PSMMSUbuntu20.04-ARM64-secure
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
index 554ed8881..9f28d022e 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
@@ -59,12 +59,21 @@ stages:
 
       - template: ./releaseJob.yml
         parameters:
-          jobName: ${{ parameters.channel }}_linux_arm
+          jobName: ${{ parameters.channel }}_linux_arm64
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
           WhatIf: ${{ parameters.WhatIf }}
           vmImage: "PSMMSUbuntu20.04-Secure"
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
+            
+      - template: ./releaseJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux_arm32
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
+          WhatIf: ${{ parameters.WhatIf }}
+          vmImage: "PSMMSUbuntu20.04-Secure"
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
 
     - stage: Release_ManifestList_${{ parameters.channel }}
       jobs:
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index 340314c40..b6a97d5ba 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -58,3 +58,12 @@ stages:
           vmImage: ubuntu-latest
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
+
+      - template: ./testJob.yml
+        parameters:
+          jobName: ${{ parameters.channel }}_linux
+          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
+          vmImage: ubuntu-latest
+          dependsOn:
+            - GenerateYaml_${{ parameters.channel }}
+            
diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
index 4c8c51885..d32f92acf 100644
--- a/release/7-2/ubuntu18.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu18.04-arm32v7/meta.json
@@ -22,5 +22,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-2/ubuntu20.04-arm32v7/meta.json b/release/7-2/ubuntu20.04-arm32v7/meta.json
index c5e9cc22b..bb1de7e47 100644
--- a/release/7-2/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu20.04-arm32v7/meta.json
@@ -22,5 +22,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
index 8d2fd1f7c..0c6ffb5aa 100644
--- a/release/7-2/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -25,5 +25,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-3/ubuntu20.04-arm32v7/meta.json b/release/7-3/ubuntu20.04-arm32v7/meta.json
index 204e9e8e4..5e5d0ee14 100644
--- a/release/7-3/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu20.04-arm32v7/meta.json
@@ -18,5 +18,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
index 4f1fffcf0..66eb4370a 100644
--- a/release/7-3/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -21,5 +21,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-4/ubuntu20.04-arm32v7/meta.json b/release/7-4/ubuntu20.04-arm32v7/meta.json
index 204e9e8e4..5e5d0ee14 100644
--- a/release/7-4/ubuntu20.04-arm32v7/meta.json
+++ b/release/7-4/ubuntu20.04-arm32v7/meta.json
@@ -18,5 +18,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }
diff --git a/release/7-4/ubuntu22.04-arm32v7/meta.json b/release/7-4/ubuntu22.04-arm32v7/meta.json
index 4f1fffcf0..66eb4370a 100644
--- a/release/7-4/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-4/ubuntu22.04-arm32v7/meta.json
@@ -21,5 +21,5 @@
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
     "UseInCi": false,
-    "Architecture": "arm64"
+    "Architecture": "arm32"
 }

From 94a06cb33b1bdb55709bd7d1168e9052dff25269 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Thu, 9 Mar 2023 10:44:49 -0800
Subject: [PATCH 278/354] Update the matrix json (#735)

---
 assets/matrix.json | 438 ++++++++++++++++++++++-----------------------
 1 file changed, 219 insertions(+), 219 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index a3bf70f57..1132f8c0e 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -4,26 +4,26 @@
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
@@ -43,39 +43,39 @@
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu18.04",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "ubuntu18.04",
+      "OsVersion": "Ubuntu 18.04",
+      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true
     },
     {
@@ -83,42 +83,42 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
       "UseInCI": true
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "ImageName": "ubuntu18.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "JobName": "ubuntu18.04_arm32v7",
+      "OsVersion": "Ubuntu 18.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
       "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -131,31 +131,18 @@
       "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
       "UseInCI": false
     },
-    {
-      "Architecture": "amd64",
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
-      "UseInCI": true
-    },
     {
       "Architecture": "amd64",
       "Channel": "lts",
@@ -194,6 +181,19 @@
       "OsVersion": "Windows Server Core, LTSC 2022",
       "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "UseInCI": true
     }
   ],
   "preview": [
@@ -201,105 +201,105 @@
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.3-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.4-debian-buster-slim;preview-7.4-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "preview-7.3-mariner-2.0;preview-mariner-2.0",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.4-ubuntu-jammy;preview-7.4-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "preview-7.3-ubi-8;preview-ubi-8",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.4-debian-bullseye-slim;preview-7.4-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.3-debian-bullseye-slim;preview-7.3-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "TagList": "preview-7.4-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "preview-7.3-alpine-3.14;preview-alpine-3.14",
-      "UseInCI": false
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "preview-7.4-ubi-9;preview-ubi-9",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.3-ubuntu-focal;preview-7.3-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
-      "UseInCI": false
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "preview-7.4-mariner-2.0;preview-mariner-2.0",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.3-ubuntu-jammy;preview-7.3-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "UseInCI": true
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "preview-7.4-alpine-3.14;preview-alpine-3.14",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.3-ubi-9;preview-ubi-9",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
@@ -307,15 +307,15 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.3-debian-buster-slim;preview-7.3-debian-10;preview-debian-buster-slim;preview-debian-10",
-      "UseInCI": true
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.4-ubuntu-focal;preview-7.4-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -324,11 +324,11 @@
       "IsLinux": true,
       "JobName": "ubuntu22.04_arm32v7",
       "OsVersion": "Ubuntu 22.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-jammy-arm32;preview-7.3-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
+      "TagList": "preview-7.4-ubuntu-jammy-arm32;preview-7.4-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -337,7 +337,20 @@
       "IsLinux": true,
       "JobName": "ubuntu20.04_arm32v7",
       "OsVersion": "Ubuntu 20.04 ARM 32v7",
-      "TagList": "preview-7.3-ubuntu-focal-arm32;preview-7.3-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
+      "TagList": "preview-7.4-ubuntu-focal-arm32;preview-7.4-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "arm64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-12-14T00:00:00",
+      "ImageName": "mariner2-arm64",
+      "IsLinux": true,
+      "JobName": "mariner2_arm64",
+      "OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
+      "TagList": "preview-7.4-mariner-2.0-arm64;preview-mariner-2.0-arm64",
       "UseInCI": false
     },
     {
@@ -346,11 +359,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "preview-7.3-nanoserver-1809;preview-nanoserver-1809",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.4-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
@@ -363,61 +376,48 @@
       "IsLinux": false,
       "JobName": "windowsserver2022",
       "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.3-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "TagList": "preview-7.4-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
-    },
+    }
+  ],
+  "stable": [
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
-      "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "preview-7.3-nanoserver-ltsc2022;preview-nanoserver-ltsc2022",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.3-debian-buster-slim;7.3-debian-10;debian-buster-slim;debian-10",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
-      "Channel": "preview",
+      "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
-      "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.3-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
-      "UseInCI": true
-    }
-  ],
-  "stable": [
-    {
-      "Architecture": "amd64",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "7.3-alpine-3.15;alpine-3.15",
-      "UseInCI": false
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "7.3-mariner-2.0;mariner-2.0",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
@@ -437,66 +437,53 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "ImageCreation",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9",
+      "TagList": "7.3-ubi-9;ubi-9",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
-      "TagList": "7.3-alpine-3.14;alpine-3.14",
-      "UseInCI": false
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "7.3-mariner-2.0;mariner-2.0",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2023-05-01T00:00:00",
+      "ImageName": "alpine314",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.3-ubuntu-focal;7.3-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "alpine314",
+      "OsVersion": "Alpine 3.14",
+      "TagList": "7.3-alpine-3.14;alpine-3.14",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
-      "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "UseInCI": true
-    },
-    {
-      "Architecture": "amd64",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "7.3-ubi-9;ubi-9",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "7.3-alpine-3.15;alpine-3.15",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
@@ -504,15 +491,15 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.3-debian-buster-slim;7.3-debian-10;debian-buster-slim;debian-10",
-      "UseInCI": true
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.3-ubuntu-focal;7.3-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -525,7 +512,7 @@
       "UseInCI": false
     },
     {
-      "Architecture": "arm64",
+      "Architecture": "arm32",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
@@ -538,17 +525,17 @@
       "UseInCI": false
     },
     {
-      "Architecture": "amd64",
+      "Architecture": "arm64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
-      "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.3-nanoserver-1809;nanoserver-1809",
-      "UseInCI": true
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-12-14T00:00:00",
+      "ImageName": "mariner2-arm64",
+      "IsLinux": true,
+      "JobName": "mariner2_arm64",
+      "OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
+      "TagList": "7.3-mariner-2.0-arm64;mariner-2.0-arm64",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
@@ -588,6 +575,19 @@
       "OsVersion": "Windows Server Core, LTSC 2022",
       "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "nanoserver1809",
+      "IsLinux": false,
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.3-nanoserver-1809;nanoserver-1809",
+      "UseInCI": true
     }
   ]
 }

From 801c3190bb511b3b5d293d55db7d4db801f3acc5 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:47:39 -0700
Subject: [PATCH 279/354] Update the release build yaml with the latest
 versions (#740)

---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 352cd3ad4..3130131dc 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-preview.1'
+    default: 'v7.4.0-preview.2'
   - name: 'ltsReleaseTag'
     default: 'v7.2.10'
   - name: 'stableReleaseTag'

From e8c2c57adf16d9fb0a15c4527ce0a14d2fdc5853 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Mar 2023 11:57:24 -0700
Subject: [PATCH 280/354] Update mariner preview dotnet runtime install (#741)

---
 .vsts-ci/phase.yml                     | 16 +++++++--
 release/7-4/mariner2/docker/Dockerfile | 45 +++++++++++++++++++-------
 unittests/generateMatrixJson.tests.ps1 |  2 +-
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml
index b90817421..a8445695e 100644
--- a/.vsts-ci/phase.yml
+++ b/.vsts-ci/phase.yml
@@ -23,14 +23,19 @@ parameters:
 jobs:
 - job: ${{ parameters.jobName }}
   dependsOn: ${{ parameters.dependsOn }}
+  
   strategy:
       matrix: $[ ${{ parameters.matrix }} ]
       maxParallel: ${{ parameters.maxParallel }}
 
   variables:
-    ContinueOnError: ${{ parameters.continueonerror }}
-    scanType: Register
-    pool: ${{ parameters.pool }}
+    - group: Cache-ACR
+    - name: ContinueOnError
+      value: ${{ parameters.continueonerror }}
+    - name: scanType
+      value: Register
+    - name: pool
+      value: ${{ parameters.pool }}
 
   pool:
     ${{ if eq(parameters['pool'],'')}}:
@@ -72,6 +77,11 @@ jobs:
       Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
     displayName: Install Pester
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+    
+  - pwsh: |
+      docker login psdockercache.azurecr.io -u $(dockerCacheUserName) -p $(dockerCacheKey)
+    displayName: 'docker cache login'
+    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
   - pwsh: |
       $extraParams = @{}
diff --git a/release/7-4/mariner2/docker/Dockerfile b/release/7-4/mariner2/docker/Dockerfile
index 61db08807..e50f17aed 100644
--- a/release/7-4/mariner2/docker/Dockerfile
+++ b/release/7-4/mariner2/docker/Dockerfile
@@ -1,7 +1,14 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y mariner-repos-microsoft-preview \
+    && tdnf makecache
+
+# Move to
+FROM setup-tdnf-repa AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
@@ -13,10 +20,24 @@ ARG PS_INSTALL_VERSION=7-preview
 # Download the Linux tar.gz and save it
 ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y \
+        wget \
+        awk \
+        tar \
+        ca-certificates
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    --mount=type=cache,target=/installTmp \
+    cd /installTmp \
+    && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+    && chmod +x ./dotnet-install.sh \
+    && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
+
 RUN echo ${PS_PACKAGE_URL}
 
 # Start a new stage so we lose all the tar.gz layers from the final image
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
+FROM setup-tdnf-repa AS powershell
 
 ARG PS_VERSION=7.3.0-preview.8
 ARG PS_INSTALL_VERSION=7-preview
@@ -33,28 +54,30 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
     POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
 
-# Install dependencies and clean up
 RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y mariner-repos-microsoft-preview \
-    && tdnf makecache \
     # install dependencies
-    && tdnf install -y \
+    tdnf install -y \
     # required for localization
     icu \
     # required for help in PowerShell
     less \
     # required for SSH
     openssh-clients \
-    ca-certificates \
-    dotnet-runtime-7.0 \
-    # upgrade packages
-    && tdnf upgrade -y \
+    ca-certificates
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf upgrade -y \
     # clean cached data
     && tdnf clean all
 
+COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
 RUN --mount=type=cache,target=/var/cache/tdnf,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    rpm -i /mnt/rpm/powershell.rpm
+    rpm -i --nodeps /mnt/rpm/powershell.rpm
 
 # Create the pwsh symbolic link that points to powershell
 RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
diff --git a/unittests/generateMatrixJson.tests.ps1 b/unittests/generateMatrixJson.tests.ps1
index 8b27ed81c..1e11fa9fd 100644
--- a/unittests/generateMatrixJson.tests.ps1
+++ b/unittests/generateMatrixJson.tests.ps1
@@ -43,7 +43,7 @@ Describe "build.ps1 -GenerateMatrixJson" {
                 $json = $vstsVariable.Value
                 { $script:matrix += $json | ConvertFrom-Json -AsHashtable } | should -not -Throw
             }
-            $script:matrix.count | Should -Be 3
+            $script:matrix.count | Should -Be 4
         }
         It "Should have multiple images" {
             foreach($platforMatrix in $Script:matrix) {

From 099e402cf556db3648b8251b512c1c2a6196170b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Mar 2023 09:30:41 -0700
Subject: [PATCH 281/354] Use channel tags to make manifest list more automatic
 (#743)

* Use channel tags to make manifest list more automatic

* Add unit test to verify we mix manifest list channels

* Update unittests/generateManifestLists.tests.ps1

* Update unittests/generateManifestLists.tests.ps1

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>

* add new format of manifest list

* update how we create the manifest create cmdline

* fix release tests

* mark amazon linux as unstable

* mark mariner as arm for test purposes

* remove community channel

* mark the right image

* remove community CI

* skip tasks when matrix is empty

---------

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .vsts-ci/manifestSteps.yml                    |  4 ++
 .../templatesReleasePipeline/releaseJob.yml   |  1 +
 .vsts-ci/templatesReleasePipeline/testJob.yml |  2 +
 .../templatesReleasePipeline/testStage.yml    |  6 +--
 build.ps1                                     | 40 +++++++++++++++++--
 createManifest.ps1                            | 13 ++++--
 release/7-2/nanoserver1809/meta.json          |  2 +-
 release/7-2/nanoserver2022/meta.json          |  2 +-
 release/7-2/ubi8/meta.json                    |  3 +-
 release/7-2/ubuntu22.04-arm32v7/meta.json     |  2 +-
 release/7-2/ubuntu22.04/meta.json             |  2 +-
 release/7-2/windowsserver2022/meta.json       |  2 +-
 release/7-2/windowsservercore2022/meta.json   |  2 +-
 release/7-3/mariner2-arm64/meta.json          |  2 +-
 release/7-3/nanoserver2022/meta.json          |  2 +-
 release/7-3/ubi9/meta.json                    |  3 +-
 release/7-3/ubuntu22.04-arm32v7/meta.json     |  2 +-
 release/7-3/ubuntu22.04/meta.json             |  2 +-
 release/7-3/windowsserver2022/meta.json       |  2 +-
 release/7-3/windowsservercore2022/meta.json   |  2 +-
 release/7-4/mariner2-arm64/meta.json          |  2 +-
 release/7-4/ubi9/meta.json                    |  3 +-
 release/7-4/ubuntu22.04-arm32v7/meta.json     |  2 +-
 release/7-4/ubuntu22.04/meta.json             |  2 +-
 release/7-4/windowsserver2022/meta.json       |  2 +-
 release/7-4/windowsservercore2022/meta.json   |  2 +-
 release/unstable/7-4/nanoserver2022/meta.json |  2 +-
 .../amazonlinux/docker/Dockerfile             |  0
 .../amazonlinux/meta.json                     |  0
 .../amazonlinux/test-deps/docker/Dockerfile   |  0
 .../amazonlinux/test-deps/meta.json           |  0
 tools/buildHelper/buildHelper.psm1            |  2 +-
 tools/buildHelper/channels.json               |  6 ---
 unittests/generateManifestLists.tests.ps1     | 20 ++++++++++
 vsts-ci.yml                                   |  4 --
 35 files changed, 100 insertions(+), 43 deletions(-)
 rename release/{community-stable => unstable}/amazonlinux/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/amazonlinux/meta.json (100%)
 rename release/{community-stable => unstable}/amazonlinux/test-deps/docker/Dockerfile (100%)
 rename release/{community-stable => unstable}/amazonlinux/test-deps/meta.json (100%)

diff --git a/.vsts-ci/manifestSteps.yml b/.vsts-ci/manifestSteps.yml
index 4d1cc63f3..0b971a5bc 100644
--- a/.vsts-ci/manifestSteps.yml
+++ b/.vsts-ci/manifestSteps.yml
@@ -7,6 +7,10 @@ steps:
 - powershell: 'Get-ChildItem env:'
   displayName: 'Capture Environment'
 
+- pwsh: |
+    $PSVersionTable
+  displayName: Capture pwsh Version
+
 - powershell: |
       $dockerConfigFolder = "$env:userprofile/.docker"
       if(!(Test-Path $dockerConfigFolder)){ $null = new-item -Type Directory -Path $dockerConfigFolder}
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
index c169e70a8..385e9f42d 100644
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
@@ -102,6 +102,7 @@ jobs:
               }
             }
       displayName: 'release - $(channel) - $(imagename)'
+      condition: and( succeeded(), ne(variables['Channel'],''))
 
     - pwsh: 'az logout'
       displayName: 'az logout'
diff --git a/.vsts-ci/templatesReleasePipeline/testJob.yml b/.vsts-ci/templatesReleasePipeline/testJob.yml
index 38f1417db..bbeb35d9e 100644
--- a/.vsts-ci/templatesReleasePipeline/testJob.yml
+++ b/.vsts-ci/templatesReleasePipeline/testJob.yml
@@ -84,6 +84,8 @@ jobs:
             }
             .\build.ps1 -test -Channel $(Channel) -Pull -ImageName $(dockerHost) -name '$(ImageName)' -Version $(Version) -TestLogPostfix windows-$(Channel) -Repository $(dockerNamespace)/powershell @extraParams
       displayName: 'Run Tests for $(Channel) - $(ImageName)'
+      condition: and( succeeded(), ne(variables['Channel'],''))
+
 
     - task: PublishTestResults@2
       displayName: 'Publish Test Results **/test*.xml'
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
index b6a97d5ba..0b96d1457 100644
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ b/.vsts-ci/templatesReleasePipeline/testStage.yml
@@ -53,7 +53,7 @@ stages:
 
       - template: ./testJob.yml
         parameters:
-          jobName: ${{ parameters.channel }}_linux
+          jobName: ${{ parameters.channel }}_linux_arm64
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
           vmImage: ubuntu-latest
           dependsOn:
@@ -61,9 +61,9 @@ stages:
 
       - template: ./testJob.yml
         parameters:
-          jobName: ${{ parameters.channel }}_linux
+          jobName: ${{ parameters.channel }}_linux_arm32
           matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
           vmImage: ubuntu-latest
           dependsOn:
             - GenerateYaml_${{ parameters.channel }}
-            
+
diff --git a/build.ps1 b/build.ps1
index 97b620e99..b98e2a5fd 100755
--- a/build.ps1
+++ b/build.ps1
@@ -668,10 +668,25 @@ End {
     if ($GenerateManifestLists.IsPresent) {
         $manifestLists = @()
         $tags = @()
+
         foreach ($repo in $tagGroups.Keys | Sort-Object) {
             $channelGroups = $tagGroups.$repo | Group-Object -Property Channel
             foreach ($channelGroup in $channelGroups) {
                 $channelName = $channelGroup.Name
+                switch($channelName) {
+                    'stable' {
+                        $channelTag = 'latest'
+                        $channelTagPrefix = ''
+                        $channelTagPostfix = ''
+                    }
+
+                    default {
+                        $channelTag = $channelName.ToLower()
+                        $channelTagPrefix = $channelTag + '-'
+                        $channelTagPostfix = '-' + $channelTag
+                    }
+                }
+
                 Write-Verbose "generating $channelName json"
                 $osGroups = $channelGroup.Group | Group-Object -Property os
                 foreach ($osGroup in $osGroups) {
@@ -681,14 +696,31 @@ End {
                     foreach ($tag in $osGroup.Group | Where-Object { $_.Name -notlike '*/*' } | Sort-Object -Property ManifestLists) {
                         if ($tag.ManifestLists) {
                             foreach ($manifestList in $tag.ManifestLists) {
+                                $originalManifestList = $manifestList
+                                if ($manifestList -notlike '*${channel*') {
+                                    Write-Warning "Issue found with $osName $manifestList $($tag.Tags)"
+                                    throw 'ManifestLists entries must contain on of: ${channelTag} ${channelTagPrefix} ${channelTagPostfix}'
+                                }
+
+                                $manifestList = $manifestList -replace '\${channelTag}', $channelTag
+                                $manifestList = $manifestList -replace '\${channelTagPrefix}', $channelTagPrefix
+                                $manifestList = $manifestList -replace '\${channelTagPostfix}', $channelTagPostfix
+
+                                if (!$manifestList) {
+                                    throw "error formatting $originalManifestList"
+                                }
 
                                 if ($manifestLists -notcontains $manifestList) {
                                     $manifestLists += $manifestList
                                 }
 
-                                $tag | Add-Member -MemberType NoteProperty -Value $repo -Name 'Repo'
-
-                                $tags += $tag
+                                $tags += [PSCustomObject]@{
+                                    Repo = $repo
+                                    FormattedManifestList = $manifestList
+                                    Tags = $tag.Tags
+                                    Channel = $tag.Channel
+                                    ContinueOnError = $tag.ContinueOnError
+                                }
                             }
                         }
                     }
@@ -707,7 +739,7 @@ End {
                 Repo         = ""
             }
 
-            foreach ($tag in $tags | Where-Object { $_.ManifestLists -contains $manifestList }) {
+            foreach ($tag in $tags | Where-Object { $_.FormattedManifestList -eq $manifestList }) {
                 if (-not $matrix.ContainsKey($manifestList)) {
                     $matrix.Add($manifestList, @{ })
                 }
diff --git a/createManifest.ps1 b/createManifest.ps1
index 21c2bea2b..dd88e6215 100644
--- a/createManifest.ps1
+++ b/createManifest.ps1
@@ -27,26 +27,31 @@ param(
 
     [switch]
     $SkipPush
-
 )
 
 $first = $true
 $manifestList = @()
 foreach($tag in $TagList)
 {
+    $arguments = @()
     $amend = ""
     if (!$first) {
-        $amend = '--amend'
+        $arguments += '--amend'
     }
+    $arguments += @(
+        "$ContainerRegistry/${Image}:$ManifestTag"
+        "$ContainerRegistry/${Image}:$tag"
+    )
 
-    Write-Verbose -Message "running: docker manifest create $ammend $ContainerRegistry/${Image}:$ManifestTag $ContainerRegistry/${Image}:$tag" -Verbose
-    docker manifest create $amend $ContainerRegistry/${Image}:$ManifestTag "$ContainerRegistry/${Image}:$tag"
+    Write-Verbose -Message "running: docker manifest create $arguments" -Verbose
+    docker manifest create $arguments
     $first = $false
 }
 
 # Create the manifest
 
 # Inspect (print) the manifest
+Write-Verbose -Verbose "capturing the manifest..."
 docker manifest inspect $ContainerRegistry/${Image}:$ManifestTag
 
 # push the manifest
diff --git a/release/7-2/nanoserver1809/meta.json b/release/7-2/nanoserver1809/meta.json
index b4fa7370d..c1afec468 100644
--- a/release/7-2/nanoserver1809/meta.json
+++ b/release/7-2/nanoserver1809/meta.json
@@ -12,7 +12,7 @@
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
-        "nanoserver"
+        "${channelTagPrefix}nanoserver"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/7-2/nanoserver2022/meta.json b/release/7-2/nanoserver2022/meta.json
index 3709f4f92..5116529ef 100644
--- a/release/7-2/nanoserver2022/meta.json
+++ b/release/7-2/nanoserver2022/meta.json
@@ -12,7 +12,7 @@
         "nanoserver-#shorttag#"
     ],
     "manifestLists": [
-        "nanoserver"
+        "${channelTagPrefix}nanoserver"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/7-2/ubi8/meta.json b/release/7-2/ubi8/meta.json
index aa635e425..d8571be22 100644
--- a/release/7-2/ubi8/meta.json
+++ b/release/7-2/ubi8/meta.json
@@ -12,7 +12,8 @@
         {"Tag": "8"}
     ],
     "manifestLists": [
-        "ubi"
+        "ubi${channelTagPostfix}",
+        "${channelTagPrefix}ubi"
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/7-2/ubuntu22.04-arm32v7/meta.json b/release/7-2/ubuntu22.04-arm32v7/meta.json
index 0c6ffb5aa..773901f31 100644
--- a/release/7-2/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-2/ubuntu22.04-arm32v7/meta.json
@@ -20,7 +20,7 @@
         "Arm32": true
     },
     "manifestLists": [
-        "latest"
+        "${channelTag}"
     ],
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
diff --git a/release/7-2/ubuntu22.04/meta.json b/release/7-2/ubuntu22.04/meta.json
index 6b3dbc7e5..24f17ee5c 100644
--- a/release/7-2/ubuntu22.04/meta.json
+++ b/release/7-2/ubuntu22.04/meta.json
@@ -13,7 +13,7 @@
         {"Tag": "22.04"}
     ],
     "manifestLists": [
-        "latest"
+        "${channelTag}"
     ],
     "TestProperties": {
         "size": 343
diff --git a/release/7-2/windowsserver2022/meta.json b/release/7-2/windowsserver2022/meta.json
index 78225539d..e3be58233 100644
--- a/release/7-2/windowsserver2022/meta.json
+++ b/release/7-2/windowsserver2022/meta.json
@@ -13,7 +13,7 @@
         "windowsserver-#shorttag#"
     ],
     "manifestLists": [
-        "windowsserver"
+        "${channelTagPrefix}windowsserver"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/7-2/windowsservercore2022/meta.json b/release/7-2/windowsservercore2022/meta.json
index 1a97e0576..e6e79d052 100644
--- a/release/7-2/windowsservercore2022/meta.json
+++ b/release/7-2/windowsservercore2022/meta.json
@@ -13,7 +13,7 @@
         "windowsservercore-#shorttag#"
     ],
     "manifestLists": [
-        "latest"
+        "${channelTag}"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/7-3/mariner2-arm64/meta.json b/release/7-3/mariner2-arm64/meta.json
index 418d3850b..70a0f00f6 100644
--- a/release/7-3/mariner2-arm64/meta.json
+++ b/release/7-3/mariner2-arm64/meta.json
@@ -12,7 +12,7 @@
     ],
     "TestProperties": {
         "size": 404,
-        "arm64": true
+        "Arm32": true
     },
     "EndOfLife": "2023-12-14",
     "DistributionState": "Validating",
diff --git a/release/7-3/nanoserver2022/meta.json b/release/7-3/nanoserver2022/meta.json
index 91b80f257..f87ab883e 100644
--- a/release/7-3/nanoserver2022/meta.json
+++ b/release/7-3/nanoserver2022/meta.json
@@ -9,7 +9,7 @@
     ],
     "ShortDistroName": "nanoserver",
     "manifestLists": [
-        "nanoserver"
+        "${channelTagPrefix}nanoserver"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/7-3/ubi9/meta.json b/release/7-3/ubi9/meta.json
index 3c067062b..cf260a311 100644
--- a/release/7-3/ubi9/meta.json
+++ b/release/7-3/ubi9/meta.json
@@ -9,7 +9,8 @@
         {"Tag": "9"}
     ],
     "manifestLists": [
-        "ubi-preview"
+        "ubi${channelTagPostfix}",
+        "${channelTagPrefix}ubi"
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/7-3/ubuntu22.04-arm32v7/meta.json b/release/7-3/ubuntu22.04-arm32v7/meta.json
index 66eb4370a..e846f4518 100644
--- a/release/7-3/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-3/ubuntu22.04-arm32v7/meta.json
@@ -16,7 +16,7 @@
         "Arm32": true
     },
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
diff --git a/release/7-3/ubuntu22.04/meta.json b/release/7-3/ubuntu22.04/meta.json
index 6aed4183b..647fa3c84 100644
--- a/release/7-3/ubuntu22.04/meta.json
+++ b/release/7-3/ubuntu22.04/meta.json
@@ -10,7 +10,7 @@
         {"Tag": "22.04"}
     ],
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "TestProperties": {
         "size": 338
diff --git a/release/7-3/windowsserver2022/meta.json b/release/7-3/windowsserver2022/meta.json
index 1be0aa667..de7049fef 100644
--- a/release/7-3/windowsserver2022/meta.json
+++ b/release/7-3/windowsserver2022/meta.json
@@ -10,7 +10,7 @@
     "Base64EncodePackageUrl": true,
     "ShortDistroName": "windowsserver",
     "manifestLists": [
-        "windowsserver"
+        "${channelTagPrefix}windowsserver"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/7-3/windowsservercore2022/meta.json b/release/7-3/windowsservercore2022/meta.json
index 849bbfb0d..a1b9c11ce 100644
--- a/release/7-3/windowsservercore2022/meta.json
+++ b/release/7-3/windowsservercore2022/meta.json
@@ -8,7 +8,7 @@
         }
     ],
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "Base64EncodePackageUrl": true,
     "ShortDistroName": "windowsservercore",
diff --git a/release/7-4/mariner2-arm64/meta.json b/release/7-4/mariner2-arm64/meta.json
index c2faa5f89..c586b4a90 100644
--- a/release/7-4/mariner2-arm64/meta.json
+++ b/release/7-4/mariner2-arm64/meta.json
@@ -12,7 +12,7 @@
     ],
     "TestProperties": {
         "size": 404,
-        "arm64": true
+        "Arm32": true
     },
     "EndOfLife": "2023-12-14",
     "DistributionState": "Validating",
diff --git a/release/7-4/ubi9/meta.json b/release/7-4/ubi9/meta.json
index 3c067062b..cf260a311 100644
--- a/release/7-4/ubi9/meta.json
+++ b/release/7-4/ubi9/meta.json
@@ -9,7 +9,8 @@
         {"Tag": "9"}
     ],
     "manifestLists": [
-        "ubi-preview"
+        "ubi${channelTagPostfix}",
+        "${channelTagPrefix}ubi"
     ],
     "SubImage": "test-deps",
     "TestProperties": {
diff --git a/release/7-4/ubuntu22.04-arm32v7/meta.json b/release/7-4/ubuntu22.04-arm32v7/meta.json
index 66eb4370a..e846f4518 100644
--- a/release/7-4/ubuntu22.04-arm32v7/meta.json
+++ b/release/7-4/ubuntu22.04-arm32v7/meta.json
@@ -16,7 +16,7 @@
         "Arm32": true
     },
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "EndOfLife": "2023-04-02",
     "DistributionState": "Validated",
diff --git a/release/7-4/ubuntu22.04/meta.json b/release/7-4/ubuntu22.04/meta.json
index 6aed4183b..647fa3c84 100644
--- a/release/7-4/ubuntu22.04/meta.json
+++ b/release/7-4/ubuntu22.04/meta.json
@@ -10,7 +10,7 @@
         {"Tag": "22.04"}
     ],
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "TestProperties": {
         "size": 338
diff --git a/release/7-4/windowsserver2022/meta.json b/release/7-4/windowsserver2022/meta.json
index 1be0aa667..de7049fef 100644
--- a/release/7-4/windowsserver2022/meta.json
+++ b/release/7-4/windowsserver2022/meta.json
@@ -10,7 +10,7 @@
     "Base64EncodePackageUrl": true,
     "ShortDistroName": "windowsserver",
     "manifestLists": [
-        "windowsserver"
+        "${channelTagPrefix}windowsserver"
     ],
     "TestProperties": {
         "size": 1
diff --git a/release/7-4/windowsservercore2022/meta.json b/release/7-4/windowsservercore2022/meta.json
index 849bbfb0d..a1b9c11ce 100644
--- a/release/7-4/windowsservercore2022/meta.json
+++ b/release/7-4/windowsservercore2022/meta.json
@@ -8,7 +8,7 @@
         }
     ],
     "manifestLists": [
-        "preview"
+        "${channelTag}"
     ],
     "Base64EncodePackageUrl": true,
     "ShortDistroName": "windowsservercore",
diff --git a/release/unstable/7-4/nanoserver2022/meta.json b/release/unstable/7-4/nanoserver2022/meta.json
index 91b80f257..f87ab883e 100644
--- a/release/unstable/7-4/nanoserver2022/meta.json
+++ b/release/unstable/7-4/nanoserver2022/meta.json
@@ -9,7 +9,7 @@
     ],
     "ShortDistroName": "nanoserver",
     "manifestLists": [
-        "nanoserver"
+        "${channelTagPrefix}nanoserver"
     ],
     "Base64EncodePackageUrl": true,
     "TestProperties": {
diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/unstable/amazonlinux/docker/Dockerfile
similarity index 100%
rename from release/community-stable/amazonlinux/docker/Dockerfile
rename to release/unstable/amazonlinux/docker/Dockerfile
diff --git a/release/community-stable/amazonlinux/meta.json b/release/unstable/amazonlinux/meta.json
similarity index 100%
rename from release/community-stable/amazonlinux/meta.json
rename to release/unstable/amazonlinux/meta.json
diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/unstable/amazonlinux/test-deps/docker/Dockerfile
similarity index 100%
rename from release/community-stable/amazonlinux/test-deps/docker/Dockerfile
rename to release/unstable/amazonlinux/test-deps/docker/Dockerfile
diff --git a/release/community-stable/amazonlinux/test-deps/meta.json b/release/unstable/amazonlinux/test-deps/meta.json
similarity index 100%
rename from release/community-stable/amazonlinux/test-deps/meta.json
rename to release/unstable/amazonlinux/test-deps/meta.json
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index d24c8d49e..dc4aa9e5e 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -266,7 +266,7 @@ class DockerImageMetaData {
     [bool]
     $ContinueOnError = $false
 
-    [string]
+    [string[]]
     $ManifestLists = @()
 
     [bool]
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index f42d923a4..c23778e5b 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -18,11 +18,5 @@
         "tagPrefix": "lts",
         "pwshInstallVersion": "7-lts",
         "packageTag": "-lts"
-    },
-    {
-        "name": "community-stable",
-        "path": "release/community-stable",
-        "pwshInstallVersion": "7",
-        "packageTag": ""
     }
 ]
diff --git a/unittests/generateManifestLists.tests.ps1 b/unittests/generateManifestLists.tests.ps1
index 84a12edca..92bdc3a8c 100644
--- a/unittests/generateManifestLists.tests.ps1
+++ b/unittests/generateManifestLists.tests.ps1
@@ -13,4 +13,24 @@ Describe "build.ps1 -GenerateManifestLists" {
         $json | Should -Not -BeNullOrEmpty
         $json | ConvertFrom-Json -AsHashtable | Should -Not -BeNullOrEmpty
     }
+
+    It "Each tag should only be in one channel" {
+        $json = & $buildScript -GenerateManifestLists -Channel stable, preview, lts -OsFilter All | ConvertFrom-Json
+        $tags = @{}
+        $json | ForEach-Object {
+            $channel = $_.channel
+            foreach ($tag in $_.tags) {
+                if (!$tags.ContainsKey($tag)) {
+                    $tags[$tag] = @()
+                }
+                if ($tags[$tag] -notcontains $channel) {
+                    $tags[$tag] += $channel
+                }
+            }
+        }
+
+        foreach($tag in $tags.Keys) {
+            $tags.$tag.count | should -Be 1 -Because "$Tag should not be in multiple channels ($($tags.$tag))"
+        }
+    }
 }
diff --git a/vsts-ci.yml b/vsts-ci.yml
index c0cabc51a..eaa796fb5 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -31,10 +31,6 @@ stages:
   - template: .vsts-ci/stage.yml
     parameters:
       channel: lts
-  - template: .vsts-ci/stage.yml
-    parameters:
-      channel: community-stable
-      jobName: community_stable
 
   - stage: CheckForDuplicateTags
     displayName: Check for duplicate tags

From c66fc561abef47960c259e0e1737576d49ac3263 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 11 Apr 2023 11:45:04 -0700
Subject: [PATCH 282/354] Fix patching for ubi9 images (#747)

---
 release/7-3/ubi9/docker/Dockerfile           | 2 +-
 release/7-3/ubi9/test-deps/docker/Dockerfile | 2 +-
 release/7-4/ubi9/docker/Dockerfile           | 2 +-
 release/7-4/ubi9/test-deps/docker/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/7-3/ubi9/docker/Dockerfile b/release/7-3/ubi9/docker/Dockerfile
index 5c8653a3c..04a96136c 100644
--- a/release/7-3/ubi9/docker/Dockerfile
+++ b/release/7-3/ubi9/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
     yum localinstall -y \
       /mnt/rpm/linux.rpm \
-    && yum upgrade -y --security \
+    && yum upgrade -y \
     && yum clean all
 # Define ENVs for Localization/Globalization
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
diff --git a/release/7-3/ubi9/test-deps/docker/Dockerfile b/release/7-3/ubi9/test-deps/docker/Dockerfile
index 56c4c6af4..3ec04a1d8 100644
--- a/release/7-3/ubi9/test-deps/docker/Dockerfile
+++ b/release/7-3/ubi9/test-deps/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN yum install -y \
         git \
         unzip \
     && yum clean all \
-    && yum upgrade -y --security \
+    && yum upgrade -y \
     && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
diff --git a/release/7-4/ubi9/docker/Dockerfile b/release/7-4/ubi9/docker/Dockerfile
index 5c8653a3c..04a96136c 100644
--- a/release/7-4/ubi9/docker/Dockerfile
+++ b/release/7-4/ubi9/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/var/cache/yum,rw \
     --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
     yum localinstall -y \
       /mnt/rpm/linux.rpm \
-    && yum upgrade -y --security \
+    && yum upgrade -y \
     && yum clean all
 # Define ENVs for Localization/Globalization
 ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
diff --git a/release/7-4/ubi9/test-deps/docker/Dockerfile b/release/7-4/ubi9/test-deps/docker/Dockerfile
index 56c4c6af4..3ec04a1d8 100644
--- a/release/7-4/ubi9/test-deps/docker/Dockerfile
+++ b/release/7-4/ubi9/test-deps/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN yum install -y \
         git \
         unzip \
     && yum clean all \
-    && yum upgrade -y --security \
+    && yum upgrade -y \
     && rm -rf /var/cache/yum
 
 ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9

From aed567f636417ad278dc6214048592edb32c29cf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 12 Apr 2023 10:27:46 -0700
Subject: [PATCH 283/354] Add alpine 3.16 and 3.17 (#748)

* Add alpine 3.16 and 3.17

* Apply suggestions from code review

* Apply suggestions from code review
---
 release/7-2/alpine316/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-2/alpine316/meta.json               | 18 ++++
 .../7-2/alpine316/test-deps/docker/Dockerfile | 35 +++++++
 release/7-2/alpine316/test-deps/meta.json     | 16 ++++
 release/7-2/alpine317/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-2/alpine317/meta.json               | 21 +++++
 .../7-2/alpine317/test-deps/docker/Dockerfile | 35 +++++++
 release/7-2/alpine317/test-deps/meta.json     | 16 ++++
 release/7-3/alpine316/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-3/alpine316/meta.json               | 18 ++++
 .../7-3/alpine316/test-deps/docker/Dockerfile | 35 +++++++
 release/7-3/alpine316/test-deps/meta.json     | 16 ++++
 release/7-3/alpine317/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-3/alpine317/meta.json               | 21 +++++
 .../7-3/alpine317/test-deps/docker/Dockerfile | 35 +++++++
 release/7-3/alpine317/test-deps/meta.json     | 16 ++++
 release/7-4/alpine316/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-4/alpine316/meta.json               | 18 ++++
 .../7-4/alpine316/test-deps/docker/Dockerfile | 35 +++++++
 release/7-4/alpine316/test-deps/meta.json     | 16 ++++
 release/7-4/alpine317/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-4/alpine317/meta.json               | 21 +++++
 .../7-4/alpine317/test-deps/docker/Dockerfile | 35 +++++++
 release/7-4/alpine317/test-deps/meta.json     | 16 ++++
 24 files changed, 975 insertions(+)
 create mode 100644 release/7-2/alpine316/docker/Dockerfile
 create mode 100644 release/7-2/alpine316/meta.json
 create mode 100644 release/7-2/alpine316/test-deps/docker/Dockerfile
 create mode 100644 release/7-2/alpine316/test-deps/meta.json
 create mode 100644 release/7-2/alpine317/docker/Dockerfile
 create mode 100644 release/7-2/alpine317/meta.json
 create mode 100644 release/7-2/alpine317/test-deps/docker/Dockerfile
 create mode 100644 release/7-2/alpine317/test-deps/meta.json
 create mode 100644 release/7-3/alpine316/docker/Dockerfile
 create mode 100644 release/7-3/alpine316/meta.json
 create mode 100644 release/7-3/alpine316/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/alpine316/test-deps/meta.json
 create mode 100644 release/7-3/alpine317/docker/Dockerfile
 create mode 100644 release/7-3/alpine317/meta.json
 create mode 100644 release/7-3/alpine317/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/alpine317/test-deps/meta.json
 create mode 100644 release/7-4/alpine316/docker/Dockerfile
 create mode 100644 release/7-4/alpine316/meta.json
 create mode 100644 release/7-4/alpine316/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/alpine316/test-deps/meta.json
 create mode 100644 release/7-4/alpine317/docker/Dockerfile
 create mode 100644 release/7-4/alpine317/meta.json
 create mode 100644 release/7-4/alpine317/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/alpine317/test-deps/meta.json

diff --git a/release/7-2/alpine316/docker/Dockerfile b/release/7-2/alpine316/docker/Dockerfile
new file mode 100644
index 000000000..f5c397801
--- /dev/null
+++ b/release/7-2/alpine316/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-2/alpine316/meta.json b/release/7-2/alpine316/meta.json
new file mode 100644
index 000000000..d1335ae9e
--- /dev/null
+++ b/release/7-2/alpine316/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.16",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.16"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-2/alpine316/test-deps/docker/Dockerfile b/release/7-2/alpine316/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c7585fba2
--- /dev/null
+++ b/release/7-2/alpine316/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/alpine316/test-deps/meta.json b/release/7-2/alpine316/test-deps/meta.json
new file mode 100644
index 000000000..a8daf5955
--- /dev/null
+++ b/release/7-2/alpine316/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.16",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-2/alpine317/docker/Dockerfile b/release/7-2/alpine317/docker/Dockerfile
new file mode 100644
index 000000000..2be46d2b0
--- /dev/null
+++ b/release/7-2/alpine317/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.17
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-2/alpine317/meta.json b/release/7-2/alpine317/meta.json
new file mode 100644
index 000000000..849f58ed9
--- /dev/null
+++ b/release/7-2/alpine317/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.17",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.17"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-2/alpine317/test-deps/docker/Dockerfile b/release/7-2/alpine317/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..0053a2f64
--- /dev/null
+++ b/release/7-2/alpine317/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.17
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.17
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-2/alpine317/test-deps/meta.json b/release/7-2/alpine317/test-deps/meta.json
new file mode 100644
index 000000000..f5a9899ab
--- /dev/null
+++ b/release/7-2/alpine317/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.17",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-3/alpine316/docker/Dockerfile b/release/7-3/alpine316/docker/Dockerfile
new file mode 100644
index 000000000..f5c397801
--- /dev/null
+++ b/release/7-3/alpine316/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine316/meta.json b/release/7-3/alpine316/meta.json
new file mode 100644
index 000000000..d1335ae9e
--- /dev/null
+++ b/release/7-3/alpine316/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.16",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.16"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-3/alpine316/test-deps/docker/Dockerfile b/release/7-3/alpine316/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c7585fba2
--- /dev/null
+++ b/release/7-3/alpine316/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine316/test-deps/meta.json b/release/7-3/alpine316/test-deps/meta.json
new file mode 100644
index 000000000..a8daf5955
--- /dev/null
+++ b/release/7-3/alpine316/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.16",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-3/alpine317/docker/Dockerfile b/release/7-3/alpine317/docker/Dockerfile
new file mode 100644
index 000000000..2be46d2b0
--- /dev/null
+++ b/release/7-3/alpine317/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.17
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine317/meta.json b/release/7-3/alpine317/meta.json
new file mode 100644
index 000000000..849f58ed9
--- /dev/null
+++ b/release/7-3/alpine317/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.17",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.17"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-3/alpine317/test-deps/docker/Dockerfile b/release/7-3/alpine317/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..0053a2f64
--- /dev/null
+++ b/release/7-3/alpine317/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.17
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.17
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/alpine317/test-deps/meta.json b/release/7-3/alpine317/test-deps/meta.json
new file mode 100644
index 000000000..f5a9899ab
--- /dev/null
+++ b/release/7-3/alpine317/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.17",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-4/alpine316/docker/Dockerfile b/release/7-4/alpine316/docker/Dockerfile
new file mode 100644
index 000000000..f5c397801
--- /dev/null
+++ b/release/7-4/alpine316/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine316/meta.json b/release/7-4/alpine316/meta.json
new file mode 100644
index 000000000..d1335ae9e
--- /dev/null
+++ b/release/7-4/alpine316/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.16",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.16"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-4/alpine316/test-deps/docker/Dockerfile b/release/7-4/alpine316/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c7585fba2
--- /dev/null
+++ b/release/7-4/alpine316/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine316/test-deps/meta.json b/release/7-4/alpine316/test-deps/meta.json
new file mode 100644
index 000000000..a8daf5955
--- /dev/null
+++ b/release/7-4/alpine316/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.16",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-4/alpine317/docker/Dockerfile b/release/7-4/alpine317/docker/Dockerfile
new file mode 100644
index 000000000..2be46d2b0
--- /dev/null
+++ b/release/7-4/alpine317/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.17
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine317/meta.json b/release/7-4/alpine317/meta.json
new file mode 100644
index 000000000..849f58ed9
--- /dev/null
+++ b/release/7-4/alpine317/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "osVersion": "Alpine 3.17",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.17"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-4/alpine317/test-deps/docker/Dockerfile b/release/7-4/alpine317/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..0053a2f64
--- /dev/null
+++ b/release/7-4/alpine317/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.17
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.17
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine317/test-deps/meta.json b/release/7-4/alpine317/test-deps/meta.json
new file mode 100644
index 000000000..f5a9899ab
--- /dev/null
+++ b/release/7-4/alpine317/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.17",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}

From 41f6087149be5e238e0d432048a2a8f4cdb555b1 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Tue, 18 Apr 2023 15:41:42 -0700
Subject: [PATCH 284/354] Update the release build yaml with the latest
 versions (#750)

---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3130131dc..2a031ab47 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.4.0-preview.2'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.10'
+    default: 'v7.2.11'
   - name: 'stableReleaseTag'
-    default: 'v7.3.3'
+    default: 'v7.3.4'
 
 resources:
 - repo: self

From 499a1334857e52af50847b1ef9f33d9b6aac79dd Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:51:54 -0700
Subject: [PATCH 285/354] Update the release build yaml with the latest
 versions (#751)

---
 .vsts-ci/releasebuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 2a031ab47..15bf42e0e 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,7 +2,7 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-preview.2'
+    default: 'v7.4.0-preview.3'
   - name: 'ltsReleaseTag'
     default: 'v7.2.11'
   - name: 'stableReleaseTag'

From 3c2bcb692d308ffdafbf84657ce18fc108f06de0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 27 Apr 2023 10:07:57 -0700
Subject: [PATCH 286/354] Create devcontainer.json (#752)

---
 .devcontainer/devcontainer.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..4e6685074
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,12 @@
+{
+    "image": "mcr.microsoft.com/powershell/test-deps:ubuntu-22.04",
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/devcontainers/features/github-cli:1": {},
+        "ghcr.io/devcontainers/features/common-utils:2": {}
+    },
+    "customizations": {
+        "codespaces": {
+        }
+    }
+}

From 44a656a80ea5f72bcba5de3fc31c9617ef0bd674 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 17 May 2023 13:04:04 -0700
Subject: [PATCH 287/354] Reduce the concurrent ACR builds (#754)

* Reduce the concurrent ACR builds

* Update releaseStage.yml
---
 .vsts-ci/releaseStage.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
index f19e9141f..3304e0323 100644
--- a/.vsts-ci/releaseStage.yml
+++ b/.vsts-ci/releaseStage.yml
@@ -65,3 +65,4 @@ stages:
         jobName: Build_Win_x64
         vmImage: PSMMS2019-Secure
         ACR: yes
+        maxParallel: 3

From e00b38fc95d04fed35fa1bf9a4950d1a8abc4c99 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 6 Jul 2023 13:53:32 -0400
Subject: [PATCH 288/354] Add images for Debian12 (#755)

---
 release/7-3/debian12/docker/Dockerfile        | 100 +++++++++++++++++
 release/7-3/debian12/meta.json                |  19 ++++
 .../7-3/debian12/test-deps/docker/Dockerfile  |  24 +++++
 release/7-3/debian12/test-deps/meta.json      |  16 +++
 release/7-3/mariner2/meta.json                |   2 +-
 release/7-4/debian12/docker/Dockerfile        | 102 ++++++++++++++++++
 release/7-4/debian12/meta.json                |  19 ++++
 .../7-4/debian12/test-deps/docker/Dockerfile  |  24 +++++
 release/7-4/debian12/test-deps/meta.json      |  16 +++
 release/7-4/mariner2/meta.json                |   2 +-
 10 files changed, 322 insertions(+), 2 deletions(-)
 create mode 100644 release/7-3/debian12/docker/Dockerfile
 create mode 100644 release/7-3/debian12/meta.json
 create mode 100644 release/7-3/debian12/test-deps/docker/Dockerfile
 create mode 100644 release/7-3/debian12/test-deps/meta.json
 create mode 100644 release/7-4/debian12/docker/Dockerfile
 create mode 100644 release/7-4/debian12/meta.json
 create mode 100644 release/7-4/debian12/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/debian12/test-deps/meta.json

diff --git a/release/7-3/debian12/docker/Dockerfile b/release/7-3/debian12/docker/Dockerfile
new file mode 100644
index 000000000..ef350ed63
--- /dev/null
+++ b/release/7-3/debian12/docker/Dockerfile
@@ -0,0 +1,100 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.1
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+        tar \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.1
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-12
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu72 \
+        libssl3 \
+        libc6 \
+        libgcc-s1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/debian12/meta.json b/release/7-3/debian12/meta.json
new file mode 100644
index 000000000..b04681aa7
--- /dev/null
+++ b/release/7-3/debian12/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Debian 12",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "debian",
+    "shortTags": [
+        {"Tag": "bookworm"},
+        {"Tag": "12"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 490
+    },
+    "EndOfLife": "2025-12-25",
+    "DistributionState": "Validating"
+}
+
diff --git a/release/7-3/debian12/test-deps/docker/Dockerfile b/release/7-3/debian12/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..497c7ecae
--- /dev/null
+++ b/release/7-3/debian12/test-deps/docker/Dockerfile
@@ -0,0 +1,24 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-12
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-12
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-3/debian12/test-deps/meta.json b/release/7-3/debian12/test-deps/meta.json
new file mode 100644
index 000000000..c1f64c631
--- /dev/null
+++ b/release/7-3/debian12/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 12 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 490
+    }
+}
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index cb5f9c0f4..83cce1b2d 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -9,7 +9,7 @@
     "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 303
+        "size": 332
     },
     "EndOfLife": "2022-10-14",
     "DistributionState": "Validated"
diff --git a/release/7-4/debian12/docker/Dockerfile b/release/7-4/debian12/docker/Dockerfile
new file mode 100644
index 000000000..301af5d98
--- /dev/null
+++ b/release/7-4/debian12/docker/Dockerfile
@@ -0,0 +1,102 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+        tar \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-12
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu72 \
+        libssl3 \
+        libc6 \
+        libgcc-s1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-4/debian12/meta.json b/release/7-4/debian12/meta.json
new file mode 100644
index 000000000..b04681aa7
--- /dev/null
+++ b/release/7-4/debian12/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Debian 12",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "debian",
+    "shortTags": [
+        {"Tag": "bookworm"},
+        {"Tag": "12"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 490
+    },
+    "EndOfLife": "2025-12-25",
+    "DistributionState": "Validating"
+}
+
diff --git a/release/7-4/debian12/test-deps/docker/Dockerfile b/release/7-4/debian12/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..497c7ecae
--- /dev/null
+++ b/release/7-4/debian12/test-deps/docker/Dockerfile
@@ -0,0 +1,24 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-12
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-12
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/debian12/test-deps/meta.json b/release/7-4/debian12/test-deps/meta.json
new file mode 100644
index 000000000..c1f64c631
--- /dev/null
+++ b/release/7-4/debian12/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 12 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 490
+    }
+}
diff --git a/release/7-4/mariner2/meta.json b/release/7-4/mariner2/meta.json
index cb5f9c0f4..a8c48a05c 100644
--- a/release/7-4/mariner2/meta.json
+++ b/release/7-4/mariner2/meta.json
@@ -9,7 +9,7 @@
     "ShortDistroName": "mariner",
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 303
+        "size": 335
     },
     "EndOfLife": "2022-10-14",
     "DistributionState": "Validated"

From 2697a46b22f06827a14e55b507f10f890805ebf3 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Thu, 6 Jul 2023 12:55:20 -0700
Subject: [PATCH 289/354] Update the release build yaml with the latest
 versions (#757)

---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 15bf42e0e..3b2af2f71 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-preview.3'
+    default: 'v7.4.0-preview.4'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.11'
+    default: 'v7.2.12'
   - name: 'stableReleaseTag'
-    default: 'v7.3.4'
+    default: 'v7.3.5'
 
 resources:
 - repo: self

From 8dcf73383c68fc1c41f5840cb8988267822480d8 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 6 Jul 2023 16:19:24 -0700
Subject: [PATCH 290/354] Ubuntu 18.04 is EOL (#759)

* Ubuntu 18.04 is EOL

* Delete release/7-2/ubuntu18.04 directory
---
 .../7-2/ubuntu18.04-arm32v7/docker/Dockerfile | 70 -------------------
 release/7-2/ubuntu18.04-arm32v7/meta.json     | 26 -------
 release/7-2/ubuntu18.04/docker/Dockerfile     | 60 ----------------
 release/7-2/ubuntu18.04/meta.json             | 21 ------
 .../ubuntu18.04/test-deps/docker/Dockerfile   | 23 ------
 release/7-2/ubuntu18.04/test-deps/meta.json   | 16 -----
 6 files changed, 216 deletions(-)
 delete mode 100644 release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
 delete mode 100644 release/7-2/ubuntu18.04-arm32v7/meta.json
 delete mode 100644 release/7-2/ubuntu18.04/docker/Dockerfile
 delete mode 100644 release/7-2/ubuntu18.04/meta.json
 delete mode 100644 release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/ubuntu18.04/test-deps/meta.json

diff --git a/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
deleted file mode 100644
index c7b230d75..000000000
--- a/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) Microsoft Corporation. 
-# Licensed under the MIT License.
-
-FROM --platform=linux/arm/v7 ubuntu:bionic AS installer-env
-
-ARG PS_VERSION=7.2.3
-ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
-ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends ca-certificates wget --yes
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-    # Unzip the Linux tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM --platform=linux/arm/v7 ubuntu:bionic AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=7.2.3
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-18.04
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-
-RUN \
-  apt-get update \
-  && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json
deleted file mode 100644
index d32f92acf..000000000
--- a/release/7-2/ubuntu18.04-arm32v7/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
-    "osVersion": "Ubuntu 18.04 ARM 32v7",
-    "SkipGssNtlmSspTests": true,
-    "ShortDistroName": "ubuntu",
-    "Base64EncodePackageUrl": true,
-    "UseAcr": false,
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#-arm32",
-        "ubuntu-#shorttag#-arm32"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 550,
-        "Arm32": true
-    },
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated",
-    "UseInCi": false,
-    "Architecture": "arm32"
-}
diff --git a/release/7-2/ubuntu18.04/docker/Dockerfile b/release/7-2/ubuntu18.04/docker/Dockerfile
deleted file mode 100644
index 72cd2c65f..000000000
--- a/release/7-2/ubuntu18.04/docker/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
-FROM ubuntu:18.04 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.0
-ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Define ENVs for Localization/Globalization
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-18.04
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # curl is required to grab the Linux package
-        curl \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    # Download the Linux package and save it
-    && echo ${PS_PACKAGE_URL} \
-    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \
-    && apt-get install --no-install-recommends -y /tmp/powershell.deb \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && locale-gen $LANG && update-locale \
-    # remove powershell package
-    && rm /tmp/powershell.deb \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu18.04/meta.json b/release/7-2/ubuntu18.04/meta.json
deleted file mode 100644
index 845a73c96..000000000
--- a/release/7-2/ubuntu18.04/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
-    "osVersion": "Ubuntu 18.04",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-ubuntu-#shorttag#",
-        "ubuntu-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bionic"},
-        {"Tag": "18.04"}
-    ],
-    "TestProperties": {
-        "size": 355
-    },
-    "SubImage": "test-deps",
-    "EndOfLife": "2023-04-02",
-    "DistributionState": "Validated"
-}
diff --git a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
deleted file mode 100644
index c8e9e805a..000000000
--- a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.04
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/ubuntu18.04/test-deps/meta.json b/release/7-2/ubuntu18.04/test-deps/meta.json
deleted file mode 100644
index f1002d00c..000000000
--- a/release/7-2/ubuntu18.04/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Ubuntu 18.04",
-    "tagTemplates": [
-        "ubuntu-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 380
-    }
-}

From aec715597d077d3c67edffc47c068cb686dbe2fa Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 10 Jul 2023 11:21:45 -0700
Subject: [PATCH 291/354] Don't use debian 12 in CI until it is built (#761)

---
 release/7-4/debian12/meta.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/7-4/debian12/meta.json b/release/7-4/debian12/meta.json
index b04681aa7..1bdb0da62 100644
--- a/release/7-4/debian12/meta.json
+++ b/release/7-4/debian12/meta.json
@@ -14,6 +14,7 @@
         "size": 490
     },
     "EndOfLife": "2025-12-25",
-    "DistributionState": "Validating"
+    "DistributionState": "Validating",
+    "UseInCi": false
 }
 

From e3ae5715b77a17df60f1f5cb0f9090278ba71bbb Mon Sep 17 00:00:00 2001
From: "microsoft-github-policy-service[bot]"
 <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:30:22 -0700
Subject: [PATCH 292/354] FabricBot: Onboarding to GitOps.ResourceManagement
 because of FabricBot decommissioning (#760)

* Add prIssueManagement.yml to onboard repo to GitOps.ResourceManagement as FabricBot replacement

Owners of the FabricBot configuration should have received email notification. The same information contained in the email is published internally at: https://aka.ms/gim/fabricbot. Details on the replacement service and the syntax of the new yaml configuration file is available publicly at: https://microsoft.github.io/GitOps/policies/resource-management.html

Please review and merge this PR to complete the process of onboarding to the new service.

* Deleting fabricbot.json

---------

Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
---
 .github/fabricbot.json                  | 1556 -----------------------
 .github/policies/resourceManagement.yml |  257 ++++
 2 files changed, 257 insertions(+), 1556 deletions(-)
 delete mode 100644 .github/fabricbot.json
 create mode 100644 .github/policies/resourceManagement.yml

diff --git a/.github/fabricbot.json b/.github/fabricbot.json
deleted file mode 100644
index f18bb92bb..000000000
--- a/.github/fabricbot.json
+++ /dev/null
@@ -1,1556 +0,0 @@
-{
-  "version": "1.0",
-  "tasks": [
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Add needs author feedback label to pull requests when changes are requested",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "submitted"
-              }
-            },
-            {
-              "name": "isReviewState",
-              "parameters": {
-                "state": "changes_requested"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "4JyuQNRCDV"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove needs author feedback label when the author responds to a pull request",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Waiting on Author"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request",
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "yxEFtCSRPm"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove needs author feedback label when the author comments on a pull request",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Waiting on Author"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "cHbbgTCfiU"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove needs author feedback label when the author responds to a pull request review comment",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Waiting on Author"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "onD1b_PsZU"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label from pull requests",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Stale"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request",
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "tiWP8l9foC"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label when a pull request is commented on",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Stale"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "z9mLSvtXcC"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestReviewResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label when a pull request is reviewed",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Stale"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request_review"
-        ]
-      },
-      "id": "NlGGl_D-3P"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close stale pull requests",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              0,
-              12
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              0,
-              12
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isPr",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "0wPH-MnpIT"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Add no recent activity label to pull requests",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              6,
-              18
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isPr",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 7
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**."
-            }
-          }
-        ]
-      },
-      "id": "fwFnu-R1wS"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "AutoMerge",
-      "subCapability": "AutoMerge",
-      "version": "1.0",
-      "config": {
-        "taskName": "Automatically merge pull requests",
-        "label": "AutoMerge",
-        "silentMode": false,
-        "minMinutesOpen": "1440",
-        "mergeType": "squash",
-        "deleteBranches": true,
-        "removeLabelOnPush": true,
-        "minimumNumberOfStatuses": 2
-      },
-      "id": "jfUy-UApGV",
-      "disabled": false
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Add needs triage label to new issues",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "opened"
-              }
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isPartOfProject",
-                  "parameters": {}
-                }
-              ]
-            },
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAssignedToSomeone",
-                  "parameters": {}
-                }
-              ]
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs: Triage :mag:"
-            }
-          },
-          {
-            "name": "assignToUser",
-            "parameters": {
-              "teamName": "PowerShell",
-              "user": "travisez13",
-              "cutoff": {
-                "rotationWeekday": 1,
-                "hoursBefore": 0
-              }
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "FnXS1oXWC"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Replace needs author feedback label with needs attention label when the author comments on an issue",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "created"
-              }
-            },
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": {
-                  "type": "author"
-                }
-              }
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Waiting on Author"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Needs: Attention :wave:"
-            }
-          },
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "KGfnEUp5gm"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssuesOnlyResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label from issues",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "operator": "not",
-              "operands": [
-                {
-                  "name": "isAction",
-                  "parameters": {
-                    "action": "closed"
-                  }
-                }
-              ]
-            },
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Stale"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issues",
-          "project_card"
-        ]
-      },
-      "id": "_XP_zzsOkE"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "IssueCommentResponder",
-      "version": "1.0",
-      "config": {
-        "taskName": "Remove no recent activity label when an issue is commented on",
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "hasLabel",
-              "parameters": {
-                "label": "Stale"
-              }
-            }
-          ]
-        },
-        "actions": [
-          {
-            "name": "removeLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "eventType": "issue",
-        "eventNames": [
-          "issue_comment"
-        ]
-      },
-      "id": "ZaOF1J5Ic1"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close stale issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              8,
-              20
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 10
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "_iyk0q9nL-"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Add no recent activity label to issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Waiting on Author"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 30
-            }
-          },
-          {
-            "name": "noLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "Stale"
-            }
-          },
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **30 days**. It will be closed if no further activity occurs **within 10 days of this comment**."
-            }
-          }
-        ]
-      },
-      "id": "IOT0g54X1L"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close duplicate issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              0,
-              3,
-              6,
-              9,
-              12,
-              15,
-              18,
-              21
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Resolution-Duplicate"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 1
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "GegpTQKntV"
-    },
-    {
-      "taskType": "trigger",
-      "capabilityId": "ReleaseAnnouncement",
-      "subCapability": "ReleaseAnnouncement",
-      "version": "1.0",
-      "config": {
-        "taskName": "Announce a fix has been released",
-        "prReply": ":tada:`${version}` has been released which incorporates this pull request.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
-        "issueReply": ":tada:This issue was addressed in #${prNumber}, which has now been successfully released as `${version}`.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
-        "packageRegex": "(.*) - (\\d*)",
-        "referencedPrsRegex": "\\(#(\\d+)\\)",
-        "packageNameGroup": 1,
-        "packageVersionGroup": 2
-      },
-      "id": "GUVgGZkt8"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close fixed issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              1,
-              4,
-              7,
-              10,
-              13,
-              16,
-              19,
-              22
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Resolution-Fixed"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 1
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "BecGtfGWA"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close answered issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Resolution-Answered"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 1
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "2CswV02vu2"
-    },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "taskName": "Close external issues",
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              2,
-              5,
-              8,
-              11,
-              14,
-              17,
-              20,
-              23
-            ],
-            "timezoneOffset": -8
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isIssue",
-            "parameters": {}
-          },
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "Resolution-External"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 1
-            }
-          }
-        ],
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      },
-      "id": "iU5Km68qAs"
-    }
-  ],
-  "userGroups": []
-}
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
new file mode 100644
index 000000000..457565711
--- /dev/null
+++ b/.github/policies/resourceManagement.yml
@@ -0,0 +1,257 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - hasLabel:
+          label: Stale
+      - noActivitySince:
+          days: 7
+      actions:
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - noActivitySince:
+          days: 7
+      - isNotLabeledWith:
+          label: Stale
+      actions:
+      - addLabel:
+          label: Stale
+      - addReply:
+          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 12
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - hasLabel:
+          label: Stale
+      - noActivitySince:
+          days: 10
+      actions:
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Waiting on Author
+      - noActivitySince:
+          days: 30
+      - isNotLabeledWith:
+          label: Stale
+      actions:
+      - addLabel:
+          label: Stale
+      - addReply:
+          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **30 days**. It will be closed if no further activity occurs **within 10 days of this comment**.
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Duplicate
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Fixed
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-Answered
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes.
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 3
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Resolution-External
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Pull_Request_Review
+      - isAction:
+          action: Submitted
+      - isReviewState:
+          reviewState: Changes_requested
+      then:
+      - addLabel:
+          label: Waiting on Author
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - isActivitySender:
+          issueAuthor: True
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - removeLabel:
+          label: Waiting on Author
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - removeLabel:
+          label: Waiting on Author
+      description: 
+    - if:
+      - payloadType: Pull_Request_Review
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - removeLabel:
+          label: Waiting on Author
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+      description: 
+    - if:
+      - payloadType: Pull_Request_Review
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: AutoMerge
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: AutoMerge
+      then:
+      - disableAutoMerge
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: Waiting on Author
+      then:
+      - addLabel:
+          label: 'Needs: Attention :wave:'
+      - removeLabel:
+          label: Waiting on Author
+      description: 
+    - if:
+      - payloadType: Issues
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: Stale
+      then:
+      - removeLabel:
+          label: Stale
+      description: 
+onFailure: 
+onSuccess: 

From 6ec24211105c79376a97a3f1697c0e034448690e Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Mon, 17 Jul 2023 10:03:32 -0700
Subject: [PATCH 293/354] Update the release build yaml with the latest
 versions (#762)

---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 3b2af2f71..34eace792 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.4.0-preview.4'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.12'
+    default: 'v7.2.13'
   - name: 'stableReleaseTag'
-    default: 'v7.3.5'
+    default: 'v7.3.6'
 
 resources:
 - repo: self

From 9030a5c01e5100f4423c428afdd3f67cabcf6582 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 17 Jul 2023 10:24:58 -0700
Subject: [PATCH 294/354] Revert "Don't use debian 12 in CI until it is built
 (#761)" (#763)

This reverts commit aec715597d077d3c67edffc47c068cb686dbe2fa.
---
 release/7-4/debian12/meta.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/release/7-4/debian12/meta.json b/release/7-4/debian12/meta.json
index 1bdb0da62..b04681aa7 100644
--- a/release/7-4/debian12/meta.json
+++ b/release/7-4/debian12/meta.json
@@ -14,7 +14,6 @@
         "size": 490
     },
     "EndOfLife": "2025-12-25",
-    "DistributionState": "Validating",
-    "UseInCi": false
+    "DistributionState": "Validating"
 }
 

From 87d8a5575e39746e2a3691d3cab013b0a2b7ce0a Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Mon, 17 Jul 2023 13:36:15 -0700
Subject: [PATCH 295/354] Update the matrix json (#746)

---
 assets/matrix.json | 444 ++++++++++++++++++++++++++-------------------
 1 file changed, 261 insertions(+), 183 deletions(-)

diff --git a/assets/matrix.json b/assets/matrix.json
index 1132f8c0e..915f6e924 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -4,90 +4,90 @@
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
-      "UseInCI": true
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "lts-7.2-alpine-3.16;lts-alpine-3.16",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2032-04-01T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2032-04-01T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
-      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine317",
       "IsLinux": true,
-      "JobName": "ubuntu18.04",
-      "OsVersion": "Ubuntu 18.04",
-      "TagList": "lts-7.2-ubuntu-bionic;lts-7.2-ubuntu-18.04;lts-ubuntu-bionic;lts-ubuntu-18.04",
-      "UseInCI": true
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "lts-7.2-alpine-3.17;lts-alpine-3.17",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-05-01T00:00:00",
       "ImageName": "alpine314",
       "IsLinux": true,
       "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
+      "OsVersion": "Alpine 3.14 (End of Life)",
       "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
       "UseInCI": false
     },
@@ -97,36 +97,36 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
-      "Architecture": "arm32",
+      "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu18.04-arm32v7",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu18.04_arm32v7",
-      "OsVersion": "Ubuntu 18.04 ARM 32v7",
-      "TagList": "lts-7.2-ubuntu-bionic-arm32;lts-7.2-ubuntu-18.04-arm32;lts-ubuntu-bionic-arm32;lts-ubuntu-18.04-arm32",
-      "UseInCI": false
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "UseInCI": true
     },
     {
       "Architecture": "arm32",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7 (End of Life)",
       "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
       "UseInCI": false
     },
@@ -134,12 +134,12 @@
       "Architecture": "arm32",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
       "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
       "UseInCI": false
     },
@@ -148,12 +148,12 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "EndOfLife": "2024-01-09T00:00:00",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -162,11 +162,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
@@ -175,11 +175,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -187,12 +187,12 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-01-09T00:00:00",
-      "ImageName": "nanoserver1809",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "lts-7.2-nanoserver-1809;lts-nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -203,49 +203,62 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "preview-7.4-debian-buster-slim;preview-7.4-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.4-ubuntu-jammy;preview-7.4-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.4-ubuntu-jammy;preview-7.4-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.16;preview-alpine-3.16",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9 (End of Life)",
+      "TagList": "preview-7.4-ubi-9;preview-ubi-9",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.4-debian-bullseye-slim;preview-7.4-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "preview-7.4-mariner-2.0;preview-mariner-2.0",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-05-30T00:00:00",
       "ImageName": "ubi8",
       "IsLinux": true,
       "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
       "TagList": "preview-7.4-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
@@ -253,38 +266,64 @@
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2025-12-25T00:00:00",
+      "ImageName": "debian12",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "preview-7.4-ubi-9;preview-ubi-9",
+      "JobName": "debian12",
+      "OsVersion": "Debian 12 (In Validation)",
+      "TagList": "preview-7.4-debian-bookworm;preview-7.4-debian-12;preview-debian-bookworm;preview-debian-12",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "preview-7.4-mariner-2.0;preview-mariner-2.0",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.15;preview-alpine-3.15",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine317",
+      "IsLinux": true,
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.17;preview-alpine-3.17",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "preview-7.4-debian-buster-slim;preview-7.4-debian-10;preview-debian-buster-slim;preview-debian-10",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-05-01T00:00:00",
       "ImageName": "alpine314",
       "IsLinux": true,
       "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
+      "OsVersion": "Alpine 3.14 (End of Life)",
       "TagList": "preview-7.4-alpine-3.14;preview-alpine-3.14",
       "UseInCI": false
     },
@@ -292,14 +331,14 @@
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.4-alpine-3.15;preview-alpine-3.15",
-      "UseInCI": false
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.4-debian-bullseye-slim;preview-7.4-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
@@ -318,12 +357,12 @@
       "Architecture": "arm32",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7 (End of Life)",
       "TagList": "preview-7.4-ubuntu-jammy-arm32;preview-7.4-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": false
     },
@@ -331,12 +370,12 @@
       "Architecture": "arm32",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
       "TagList": "preview-7.4-ubuntu-focal-arm32;preview-7.4-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
       "UseInCI": false
     },
@@ -359,11 +398,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.4-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.4-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -372,11 +411,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.4-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.4-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -387,49 +426,62 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian10",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "7.3-debian-buster-slim;7.3-debian-10;debian-buster-slim;debian-10",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "7.3-alpine-3.16;alpine-3.16",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9 (End of Life)",
+      "TagList": "7.3-ubi-9;ubi-9",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2022-10-14T00:00:00",
+      "ImageName": "mariner2",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "mariner2",
+      "OsVersion": "Mariner 2.0 (End of Life)",
+      "TagList": "7.3-mariner-2.0;mariner-2.0",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-05-30T00:00:00",
       "ImageName": "ubi8",
       "IsLinux": true,
       "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (In Validation)",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
       "TagList": "7.3-ubi-8;ubi-8",
       "UseInCI": true
     },
@@ -437,38 +489,64 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "ImageCreation",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
+      "DistributionState": "Validating",
+      "EndOfLife": "2025-12-25T00:00:00",
+      "ImageName": "debian12",
       "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9",
-      "TagList": "7.3-ubi-9;ubi-9",
+      "JobName": "debian12",
+      "OsVersion": "Debian 12 (In Validation)",
+      "TagList": "7.3-debian-bookworm;7.3-debian-12;debian-bookworm;debian-12",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2022-10-14T00:00:00",
-      "ImageName": "mariner2",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "mariner2",
-      "OsVersion": "Mariner 2.0 (End of Life)",
-      "TagList": "7.3-mariner-2.0;mariner-2.0",
-      "UseInCI": true
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "7.3-alpine-3.15;alpine-3.15",
+      "UseInCI": false
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine317",
+      "IsLinux": true,
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "7.3-alpine-3.17;alpine-3.17",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian10",
+      "IsLinux": true,
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "7.3-debian-buster-slim;7.3-debian-10;debian-buster-slim;debian-10",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-05-01T00:00:00",
       "ImageName": "alpine314",
       "IsLinux": true,
       "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14",
+      "OsVersion": "Alpine 3.14 (End of Life)",
       "TagList": "7.3-alpine-3.14;alpine-3.14",
       "UseInCI": false
     },
@@ -476,14 +554,14 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "7.3-alpine-3.15;alpine-3.15",
-      "UseInCI": false
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
@@ -502,12 +580,12 @@
       "Architecture": "arm32",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7 (End of Life)",
       "TagList": "7.3-ubuntu-jammy-arm32;7.3-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
       "UseInCI": false
     },
@@ -515,12 +593,12 @@
       "Architecture": "arm32",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
+      "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
       "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
       "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
       "TagList": "7.3-ubuntu-focal-arm32;7.3-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
       "UseInCI": false
     },
@@ -543,11 +621,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "nanoserver1809",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.3-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "JobName": "nanoserver1809",
+      "OsVersion": "Nano Server, version 1809",
+      "TagList": "7.3-nanoserver-1809;nanoserver-1809",
       "UseInCI": true
     },
     {
@@ -556,11 +634,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.3-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
@@ -569,11 +647,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.3-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -582,11 +660,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver1809",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver1809",
-      "OsVersion": "Nano Server, version 1809",
-      "TagList": "7.3-nanoserver-1809;nanoserver-1809",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.3-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     }
   ]

From 4c90546025213ad162f0e316bd1f66ef0b8f95e7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 4 Aug 2023 10:49:52 -0700
Subject: [PATCH 296/354] EOL Alpine 3.14 (#764)

* Delete release/7-2/alpine314 directory

* Delete release/7-3/alpine314 directory

* Delete release/7-4/alpine314 directory
---
 release/7-2/alpine314/docker/Dockerfile       | 89 ------------------
 release/7-2/alpine314/meta.json               | 21 -----
 .../7-2/alpine314/test-deps/docker/Dockerfile | 35 -------
 release/7-2/alpine314/test-deps/meta.json     | 16 ----
 release/7-3/alpine314/docker/Dockerfile       | 93 -------------------
 release/7-3/alpine314/meta.json               | 18 ----
 .../7-3/alpine314/test-deps/docker/Dockerfile | 35 -------
 release/7-3/alpine314/test-deps/meta.json     | 16 ----
 release/7-4/alpine314/docker/Dockerfile       | 93 -------------------
 release/7-4/alpine314/meta.json               | 18 ----
 .../7-4/alpine314/test-deps/docker/Dockerfile | 35 -------
 release/7-4/alpine314/test-deps/meta.json     | 16 ----
 12 files changed, 485 deletions(-)
 delete mode 100644 release/7-2/alpine314/docker/Dockerfile
 delete mode 100644 release/7-2/alpine314/meta.json
 delete mode 100644 release/7-2/alpine314/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/alpine314/test-deps/meta.json
 delete mode 100644 release/7-3/alpine314/docker/Dockerfile
 delete mode 100644 release/7-3/alpine314/meta.json
 delete mode 100644 release/7-3/alpine314/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/alpine314/test-deps/meta.json
 delete mode 100644 release/7-4/alpine314/docker/Dockerfile
 delete mode 100644 release/7-4/alpine314/meta.json
 delete mode 100644 release/7-4/alpine314/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/alpine314/test-deps/meta.json

diff --git a/release/7-2/alpine314/docker/Dockerfile b/release/7-2/alpine314/docker/Dockerfile
deleted file mode 100644
index f8313ae14..000000000
--- a/release/7-2/alpine314/docker/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-FROM alpine:3.14 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM alpine:3.14
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine314/meta.json b/release/7-2/alpine314/meta.json
deleted file mode 100644
index de159120c..000000000
--- a/release/7-2/alpine314/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "#psversion#-alpine-#shorttag#",
-        "alpine-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "3.14"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 235
-    },
-    "EndOfLife": "2023-05-01",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-2/alpine314/test-deps/docker/Dockerfile b/release/7-2/alpine314/test-deps/docker/Dockerfile
deleted file mode 100644
index ee54a8966..000000000
--- a/release/7-2/alpine314/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add  --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine314/test-deps/meta.json b/release/7-2/alpine314/test-deps/meta.json
deleted file mode 100644
index f71e6eac6..000000000
--- a/release/7-2/alpine314/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-3/alpine314/docker/Dockerfile b/release/7-3/alpine314/docker/Dockerfile
deleted file mode 100644
index f71f5afdc..000000000
--- a/release/7-3/alpine314/docker/Dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.14 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.14
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine314/meta.json b/release/7-3/alpine314/meta.json
deleted file mode 100644
index f9f84eb1c..000000000
--- a/release/7-3/alpine314/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.14",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.14"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 251
-    },
-    "EndOfLife": "2023-05-01",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-3/alpine314/test-deps/docker/Dockerfile b/release/7-3/alpine314/test-deps/docker/Dockerfile
deleted file mode 100644
index f29f1d18d..000000000
--- a/release/7-3/alpine314/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine314/test-deps/meta.json b/release/7-3/alpine314/test-deps/meta.json
deleted file mode 100644
index f71e6eac6..000000000
--- a/release/7-3/alpine314/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-4/alpine314/docker/Dockerfile b/release/7-4/alpine314/docker/Dockerfile
deleted file mode 100644
index f71f5afdc..000000000
--- a/release/7-4/alpine314/docker/Dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.14 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.14
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.14
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine314/meta.json b/release/7-4/alpine314/meta.json
deleted file mode 100644
index f9f84eb1c..000000000
--- a/release/7-4/alpine314/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.14",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.14"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 251
-    },
-    "EndOfLife": "2023-05-01",
-    "DistributionState": "Validated",
-    "UseInCi": false
-}
diff --git a/release/7-4/alpine314/test-deps/docker/Dockerfile b/release/7-4/alpine314/test-deps/docker/Dockerfile
deleted file mode 100644
index f29f1d18d..000000000
--- a/release/7-4/alpine314/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.14
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.14
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine314/test-deps/meta.json b/release/7-4/alpine314/test-deps/meta.json
deleted file mode 100644
index f71e6eac6..000000000
--- a/release/7-4/alpine314/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}

From b7d4eb6748fc81aa14a9076c4ed1b9fcb8c151e2 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:43:05 -0700
Subject: [PATCH 297/354] Update the release build yaml with the latest
 versions (#766)

---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 34eace792..e107a5422 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-preview.4'
+    default: 'v7.4.0-preview.5'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.13'
+    default: 'v7.2.14'
   - name: 'stableReleaseTag'
-    default: 'v7.3.6'
+    default: 'v7.3.7'
 
 resources:
 - repo: self

From bfa378770a240d6812b8eca209e2c91a9a5f68e7 Mon Sep 17 00:00:00 2001
From: richard <Empty6349@tutanota.com>
Date: Tue, 26 Sep 2023 16:11:02 -0400
Subject: [PATCH 298/354] Fix the grammar in docs and comments (#768)

* Update MAINTAINERS

Fixed a few things

* Update README.powershell.md

A few small fixes

* Update development.md

Small fixes all around

* Update docs/README.powershell.md

---------

Co-authored-by: richard <finickydesert@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 docs/MAINTAINERS          | 3 ++-
 docs/README.powershell.md | 5 +++--
 docs/development.md       | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/MAINTAINERS b/docs/MAINTAINERS
index e40e12408..fed070144 100644
--- a/docs/MAINTAINERS
+++ b/docs/MAINTAINERS
@@ -15,7 +15,7 @@
     # can't solve, they show up and fix it with bizarre devices and weaponry.
     # They have final say on technical implementation and coding style.
     # They are ultimately responsible for quality in all its forms: usability polish,
-    # bugfixes, performance, stability, etc. When ownership  can cleanly be passed to
+    # Bug fixes, performance, stability, etc. When ownership  can cleanly be passed to
     # a subsystem, they are responsible for doing so and holding the
     # subsystem maintainers accountable. If ownership is unclear, they are the de facto owners.
 
@@ -85,3 +85,4 @@
         Name = "Travis Plunk"
         Email = "github@ez13.net"
         GitHub = "TravisEz13"
+
diff --git a/docs/README.powershell.md b/docs/README.powershell.md
index 7a8d2e092..d0de8500a 100644
--- a/docs/README.powershell.md
+++ b/docs/README.powershell.md
@@ -48,9 +48,9 @@ For our support policy, see [PowerShell Core Support Lifecycle](https://docs.mic
 
 ## Feedback
 
-- To give feedback for PowerShell Core,
+- To provide feedback for PowerShell Core,
   file an issue at [PowerShell/Powershell](https://github.com/PowerShell/PowerShell/issues/new/choose)
-- To give feedback for how the images are built,
+- To provide feedback on how the images are built,
   file an issue at [PowerShell/PowerShell-Docker](https://github.com/PowerShell/PowerShell-Docker/issues/new/choose)
 
 ## License
@@ -90,3 +90,4 @@ We reserve all other rights not expressly granted herein.
 As part of the Supplemental License Terms for this Container OS Image for Windows containers,
 you are also subject to the underlying Windows Server host software license terms,
 which are located at https://www.microsoft.com/en-us/useterms.
+
diff --git a/docs/development.md b/docs/development.md
index 52532e723..b2f1b2d39 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -2,11 +2,11 @@
 
 ## Building the images
 
-To build an image run `./build.ps1 -build -name <ImageFolderName>`.
+To build an image, run `./build.ps1 -build -name <ImageFolderName>`.
 
 ### Example
 
-For example to build Ubuntu 16.04/xenial, which is in `./release/stable/ubuntu16.04`:
+For example, to build Ubuntu 16.04/xenial, which is in `./release/stable/ubuntu16.04`:
 
 ```sh
 PS /powershell-docker> ./build.ps1 -Build -Name ubuntu16.04
@@ -46,7 +46,7 @@ WSManStackVersion              3.0
 
 ### Folder structure
 
-The top level folder with the `Dockerfile`s is `release`.
+The top-level folder with the `Dockerfile`s is `release`.
 This should only have folders under it.
 The three folders are:
 
@@ -68,7 +68,7 @@ In this folder, there are 4 items:
 
 All `Dockerfile`s should follow certain standards:
 
-- The following comments should be applied at the beginning of the `Dockerfile`:
+- The following remarks should be applied at the beginning of the `Dockerfile`:
 
   - Copyright notice
   - Software license
@@ -191,3 +191,4 @@ You will also need to add an entry in the `/.dependabot/config.yml` file. Here i
 ```
 
 > **Do not use `latest` as the base**, as this makes the whole purpose invalid!
+

From 5815647f40fc35ca5b223e0bb0f8d2caf4480a68 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 12 Oct 2023 17:15:23 -0700
Subject: [PATCH 299/354] Fix release break for preview releases (#772)

---
 release/7-4/mariner2/test-deps/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/7-4/mariner2/test-deps/docker/Dockerfile b/release/7-4/mariner2/test-deps/docker/Dockerfile
index 8cdf20681..396f62ec6 100644
--- a/release/7-4/mariner2/test-deps/docker/Dockerfile
+++ b/release/7-4/mariner2/test-deps/docker/Dockerfile
@@ -8,7 +8,7 @@ FROM ${BaseImage}
 
 # Install dependencies and clean up
 RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
+    tdnf update -y --exclude=powershell-preview \
     # install dependencies
     && tdnf install -y \
     dnf-utils \

From fc3842609eb7e541e5b3f18c24d3503604db1dec Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Mon, 30 Oct 2023 10:34:30 -0700
Subject: [PATCH 300/354] Update the release build yaml with the latest
 versions (#770)

---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index e107a5422..61fc06193 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-preview.5'
+    default: 'v7.4.0-rc.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.14'
+    default: 'v7.2.16'
   - name: 'stableReleaseTag'
-    default: 'v7.3.7'
+    default: 'v7.3.9'
 
 resources:
 - repo: self

From 443839647f58a065ec83b6d5b34fac52ab48a795 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 30 Oct 2023 11:12:38 -0700
Subject: [PATCH 301/354] Update the package name for Alpine tar gz packages
 (#773)

---
 release/7-4/alpine315/docker/Dockerfile | 2 +-
 release/7-4/alpine315/meta.json         | 2 +-
 release/7-4/alpine316/docker/Dockerfile | 2 +-
 release/7-4/alpine316/meta.json         | 2 +-
 release/7-4/alpine317/docker/Dockerfile | 2 +-
 release/7-4/alpine317/meta.json         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/7-4/alpine315/docker/Dockerfile b/release/7-4/alpine315/docker/Dockerfile
index 40042d5ab..6c4222e2c 100644
--- a/release/7-4/alpine315/docker/Dockerfile
+++ b/release/7-4/alpine315/docker/Dockerfile
@@ -8,7 +8,7 @@ FROM ${hostRegistry}/alpine:3.15 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
diff --git a/release/7-4/alpine315/meta.json b/release/7-4/alpine315/meta.json
index 7d298d364..c0bf1b429 100644
--- a/release/7-4/alpine315/meta.json
+++ b/release/7-4/alpine315/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
     "osVersion": "Alpine 3.15",
     "shortDistroName": "alpine",
     "shortTags": [
diff --git a/release/7-4/alpine316/docker/Dockerfile b/release/7-4/alpine316/docker/Dockerfile
index f5c397801..cfac28f6c 100644
--- a/release/7-4/alpine316/docker/Dockerfile
+++ b/release/7-4/alpine316/docker/Dockerfile
@@ -7,7 +7,7 @@ FROM ${hostRegistry}/alpine:3.16 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
diff --git a/release/7-4/alpine316/meta.json b/release/7-4/alpine316/meta.json
index d1335ae9e..8216faee0 100644
--- a/release/7-4/alpine316/meta.json
+++ b/release/7-4/alpine316/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
     "osVersion": "Alpine 3.16",
     "shortDistroName": "alpine",
     "shortTags": [
diff --git a/release/7-4/alpine317/docker/Dockerfile b/release/7-4/alpine317/docker/Dockerfile
index 2be46d2b0..c6c3f950f 100644
--- a/release/7-4/alpine317/docker/Dockerfile
+++ b/release/7-4/alpine317/docker/Dockerfile
@@ -7,7 +7,7 @@ FROM ${hostRegistry}/alpine:3.17 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
diff --git a/release/7-4/alpine317/meta.json b/release/7-4/alpine317/meta.json
index 849f58ed9..dd83a9823 100644
--- a/release/7-4/alpine317/meta.json
+++ b/release/7-4/alpine317/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
     "osVersion": "Alpine 3.17",
     "shortDistroName": "alpine",
     "shortTags": [

From 7e09acbe272dcaa2957701109ab40ba5c93ab62c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 30 Oct 2023 12:38:43 -0700
Subject: [PATCH 302/354] EOL Alpine 3.15 (#775)

* Delete release/7-4/alpine315 directory

* Delete release/7-3/alpine315 directory
---
 release/7-3/alpine315/docker/Dockerfile       | 92 ------------------
 release/7-3/alpine315/meta.json               | 18 ----
 .../7-3/alpine315/test-deps/docker/Dockerfile | 35 -------
 release/7-3/alpine315/test-deps/meta.json     | 16 ----
 release/7-4/alpine315/docker/Dockerfile       | 93 -------------------
 release/7-4/alpine315/meta.json               | 18 ----
 .../7-4/alpine315/test-deps/docker/Dockerfile | 35 -------
 release/7-4/alpine315/test-deps/meta.json     | 16 ----
 8 files changed, 323 deletions(-)
 delete mode 100644 release/7-3/alpine315/docker/Dockerfile
 delete mode 100644 release/7-3/alpine315/meta.json
 delete mode 100644 release/7-3/alpine315/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/alpine315/test-deps/meta.json
 delete mode 100644 release/7-4/alpine315/docker/Dockerfile
 delete mode 100644 release/7-4/alpine315/meta.json
 delete mode 100644 release/7-4/alpine315/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/alpine315/test-deps/meta.json

diff --git a/release/7-3/alpine315/docker/Dockerfile b/release/7-3/alpine315/docker/Dockerfile
deleted file mode 100644
index 0a2e2083f..000000000
--- a/release/7-3/alpine315/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.15 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.15
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.15
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine315/meta.json b/release/7-3/alpine315/meta.json
deleted file mode 100644
index 7d298d364..000000000
--- a/release/7-3/alpine315/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.15",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.15"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-3/alpine315/test-deps/docker/Dockerfile b/release/7-3/alpine315/test-deps/docker/Dockerfile
deleted file mode 100644
index 2c846056b..000000000
--- a/release/7-3/alpine315/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.15
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.15
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine315/test-deps/meta.json b/release/7-3/alpine315/test-deps/meta.json
deleted file mode 100644
index f71e6eac6..000000000
--- a/release/7-3/alpine315/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-4/alpine315/docker/Dockerfile b/release/7-4/alpine315/docker/Dockerfile
deleted file mode 100644
index 6c4222e2c..000000000
--- a/release/7-4/alpine315/docker/Dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine3.14 image with PowerShell installed from .tar.gz file(s)
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.15 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.15
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.15
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine315/meta.json b/release/7-4/alpine315/meta.json
deleted file mode 100644
index c0bf1b429..000000000
--- a/release/7-4/alpine315/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.15",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.15"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-4/alpine315/test-deps/docker/Dockerfile b/release/7-4/alpine315/test-deps/docker/Dockerfile
deleted file mode 100644
index 2c846056b..000000000
--- a/release/7-4/alpine315/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.15
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.15
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine315/test-deps/meta.json b/release/7-4/alpine315/test-deps/meta.json
deleted file mode 100644
index f71e6eac6..000000000
--- a/release/7-4/alpine315/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.14",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}

From cebe22bf258e69b7136ce579d1826663f1ffa886 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Mon, 30 Oct 2023 12:45:40 -0700
Subject: [PATCH 303/354] Add icu-dev and icu-data-full to make sure we have
 all the locales installed (#774)

* Add icu-dev and icu-data-full to make sure we have all the locales installed.

* Make changes to include locale tools and sources to test-deps image only.
---
 release/7-4/alpine317/test-deps/docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release/7-4/alpine317/test-deps/docker/Dockerfile b/release/7-4/alpine317/test-deps/docker/Dockerfile
index 0053a2f64..f8d5d8113 100644
--- a/release/7-4/alpine317/test-deps/docker/Dockerfile
+++ b/release/7-4/alpine317/test-deps/docker/Dockerfile
@@ -21,6 +21,8 @@ RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
         curl \
         git \
         unzip \
+        musl \
+        musl-locales \
         nodejs \
     && apk update \
     && apk upgrade \

From a131b3501394a969731ead75121e883133a43579 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 30 Oct 2023 13:21:34 -0700
Subject: [PATCH 304/354] EOL Debian 10 (#776)

* Delete release/7-4/debian10 directory

* Delete release/7-3/debian10 directory

* Delete release/7-2/debian10 directory
---
 release/7-2/debian10/docker/Dockerfile        | 96 -------------------
 release/7-2/debian10/meta.json                | 22 -----
 .../7-2/debian10/test-deps/docker/Dockerfile  | 24 -----
 release/7-2/debian10/test-deps/meta.json      | 16 ----
 release/7-3/debian10/docker/Dockerfile        | 95 ------------------
 release/7-3/debian10/meta.json                | 19 ----
 .../7-3/debian10/test-deps/docker/Dockerfile  | 24 -----
 release/7-3/debian10/test-deps/meta.json      | 16 ----
 release/7-4/debian10/docker/Dockerfile        | 95 ------------------
 release/7-4/debian10/meta.json                | 19 ----
 .../7-4/debian10/test-deps/docker/Dockerfile  | 24 -----
 release/7-4/debian10/test-deps/meta.json      | 16 ----
 12 files changed, 466 deletions(-)
 delete mode 100644 release/7-2/debian10/docker/Dockerfile
 delete mode 100644 release/7-2/debian10/meta.json
 delete mode 100644 release/7-2/debian10/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/debian10/test-deps/meta.json
 delete mode 100644 release/7-3/debian10/docker/Dockerfile
 delete mode 100644 release/7-3/debian10/meta.json
 delete mode 100644 release/7-3/debian10/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/debian10/test-deps/meta.json
 delete mode 100644 release/7-4/debian10/docker/Dockerfile
 delete mode 100644 release/7-4/debian10/meta.json
 delete mode 100644 release/7-4/debian10/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/debian10/test-deps/meta.json

diff --git a/release/7-2/debian10/docker/Dockerfile b/release/7-2/debian10/docker/Dockerfile
deleted file mode 100644
index 35a48e07f..000000000
--- a/release/7-2/debian10/docker/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.0.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu63 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian10/meta.json b/release/7-2/debian10/meta.json
deleted file mode 100644
index 75e439417..000000000
--- a/release/7-2/debian10/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 10",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "buster-slim"},
-        {"Tag": "10"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 314
-    },
-    "EndOfLife": "2024-06-01",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-2/debian10/test-deps/docker/Dockerfile b/release/7-2/debian10/test-deps/docker/Dockerfile
deleted file mode 100644
index 9089a3170..000000000
--- a/release/7-2/debian10/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-10
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian10/test-deps/meta.json b/release/7-2/debian10/test-deps/meta.json
deleted file mode 100644
index 18ca89678..000000000
--- a/release/7-2/debian10/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 10",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 390
-    }
-}
diff --git a/release/7-3/debian10/docker/Dockerfile b/release/7-3/debian10/docker/Dockerfile
deleted file mode 100644
index 595e31b58..000000000
--- a/release/7-3/debian10/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu63 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian10/meta.json b/release/7-3/debian10/meta.json
deleted file mode 100644
index 201fe811b..000000000
--- a/release/7-3/debian10/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 10",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "buster-slim"},
-        {"Tag": "10"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 331
-    },
-    "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-3/debian10/test-deps/docker/Dockerfile b/release/7-3/debian10/test-deps/docker/Dockerfile
deleted file mode 100644
index 278df8978..000000000
--- a/release/7-3/debian10/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-10
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian10/test-deps/meta.json b/release/7-3/debian10/test-deps/meta.json
deleted file mode 100644
index 7194757d7..000000000
--- a/release/7-3/debian10/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 10",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 408
-    }
-}
diff --git a/release/7-4/debian10/docker/Dockerfile b/release/7-4/debian10/docker/Dockerfile
deleted file mode 100644
index 595e31b58..000000000
--- a/release/7-4/debian10/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-10
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu63 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/debian10/meta.json b/release/7-4/debian10/meta.json
deleted file mode 100644
index 201fe811b..000000000
--- a/release/7-4/debian10/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 10",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "buster-slim"},
-        {"Tag": "10"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 331
-    },
-    "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-4/debian10/test-deps/docker/Dockerfile b/release/7-4/debian10/test-deps/docker/Dockerfile
deleted file mode 100644
index 278df8978..000000000
--- a/release/7-4/debian10/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-10
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-10
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/debian10/test-deps/meta.json b/release/7-4/debian10/test-deps/meta.json
deleted file mode 100644
index 7194757d7..000000000
--- a/release/7-4/debian10/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 10",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 408
-    }
-}

From 13ba2d9c578086f1f8b0a2c2b3279e32cecbb2b9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 30 Oct 2023 13:27:04 -0700
Subject: [PATCH 305/354] Update to new issue templates (#778)

* Create config.yml

* Update and rename .github/ISSUE_TEMPLATE.md to .github/ISSUE_TEMPLATE/bug_report.md

* Rename bug_report.md to bug_report.yaml

* Update bug_report.yaml

* Create feature_request.yaml
---
 .github/ISSUE_TEMPLATE.md                   | 49 -------------
 .github/ISSUE_TEMPLATE/bug_report.yaml      | 77 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml           | 11 +++
 .github/ISSUE_TEMPLATE/feature_request.yaml | 20 ++++++
 4 files changed, 108 insertions(+), 49 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 759b44399..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
-For Windows PowerShell 5.1 issues, suggestions, or feature requests please use the following link instead:
-- Windows PowerShell [UserVoice](https://windowsserver.uservoice.com/forums/301869-powershell)
-
-If it is a bug report:
-- make sure you are able to repro it on the latest released version.
-- Search the existing issues.
-- Fill out the following repro template:
-
-If it's not a bug, please remove the template and elaborate the issue in your own words.
--->
-## Check list
-
-- [ ] Verified that this is not a [Known Issue](https://github.com/PowerShell/PowerShell-Docker/wiki/Known-Issues)
-- [ ] Verified this is not an issues in the underlying windows container that should be reported to [Windows Feedback Hub](https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332)
-
-## Steps to reproduce
-<!-- Please include any docker commands you used to run the image -->
-
-```powershell
-
-```
-
-## Expected behavior
-
-```none
-
-```
-
-## Actual behavior
-
-```none
-
-```
-
-## Environment data
-
-<!-- provide the docker info -->
-
-```sh
-> docker info
-```
-
-<!-- provide the output of $PSVersionTable from powershell in the docker container -->
-
-```powershell
-> $PSVersionTable
-```
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..35e472f8f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,77 @@
+name: Bug report 🐛
+description: Report errors or unexpected behavior 🤔
+labels: Needs-Triage
+body:
+- type: markdown
+  attributes:
+    value: >
+      For Windows PowerShell 5.1 issues, suggestions, or feature requests please use the
+      [Feedback Hub app](https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332)
+
+      This repository is **ONLY** for PowerShell 7+ docker image issues.
+- type: checkboxes
+  attributes:
+    label: Prerequisites
+    options:
+    - label: Write a descriptive title.
+      required: true
+    - label: Make sure you are able to repro it on the latest image.
+      required: true
+    - label: Search the existing issues.
+      required: true
+    - label: Verified that this is not a [Known Issue](https://github.com/PowerShell/PowerShell-Docker/wiki/Known-Issues)
+      required: true
+    - label: Verified this is not an issues in the underlying windows container that should be reported to [Windows Feedback Hub](https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332)
+      required: true
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: >
+      List of steps, sample code, failing test or link to a project that reproduces the behavior.
+      Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
+      Please include any docker commands you used to run the image.
+    placeholder: >
+      I am experiencing a problem with X.
+      I think Y should be happening but Z is actually happening.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behavior
+    render: console
+    placeholder: |
+      PS> 2 + 2
+      4
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Actual behavior
+    render: console
+    placeholder: |
+      PS> 2 + 2
+      5
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Error details
+    description: Paste verbatim output of any error
+    render: console
+    placeholder: PS> Get-Error
+- type: textarea
+  attributes:
+    label: Environment data
+    description: Paste verbatim output from `docker manifest inspect <image reference>` below.
+    render: powershell
+    placeholder: docker manifest inspect mcr.microsoft.com/powershell
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Visuals
+    description: >
+      Please upload images or animations that can be used to reproduce issues in the area below.
+      Try the [Steps Recorder](https://support.microsoft.com/en-us/windows/record-steps-to-reproduce-a-problem-46582a9b-620f-2e36-00c9-04e25d784e47)
+      on Windows or [Screenshot](https://support.apple.com/en-us/HT208721) on macOS.
+      
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..973921cb2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Windows PowerShell
+    url: https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332
+    about: Windows PowerShell issues or suggestions.
+  - name: Support
+    url: https://github.com/PowerShell/PowerShell/blob/master/.github/SUPPORT.md
+    about: PowerShell Support Questions/Help
+  - name: Documentation Issue
+    url: https://github.com/MicrosoftDocs/PowerShell-Docs/issues/new/choose
+    about: Please open issues on documentation for PowerShell here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..c8e4cec3c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,20 @@
+name: Feature Request / Idea 🚀
+description: Suggest a new feature or improvement (this does not mean you have to implement it)
+labels: [Issue-Enhancement, Needs-Triage]
+body:
+- type: textarea
+  attributes:
+    label: Summary of the new feature / enhancement
+    description: >
+      A clear and concise description of what the problem is that the
+      new feature would solve. Try formulating it in user story style
+      (if applicable).
+    placeholder: "'As a user I want X so that Y...' with X being the being the action and Y being the value of the action."
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Proposed technical implementation details (optional)
+    placeholder: >
+      A clear and concise description of what you want to happen.
+      Consider providing an example PowerShell experience with expected result.

From b221586e5082c2c8caa458ffb67bc40d2300a11c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 Oct 2023 10:45:05 -0700
Subject: [PATCH 306/354] Fix links in README.md (#777)

* Update README.md

* Update vsts-ci.yml
---
 README.md   | 8 ++++----
 vsts-ci.yml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 547977b53..3c51ae621 100644
--- a/README.md
+++ b/README.md
@@ -6,22 +6,22 @@ This requires Docker 17.05 or newer.
 It also expects you to be able to run Docker without `sudo`.
 Please follow [Docker's official instructions][install] to install Docker correctly.
 
-[install]: https://docs.docker.com/engine/installation/
+[install]: https://docs.docker.com/engine/install/
 
 ## Release
 
 The release containers derive from the official distribution image,
-such as `centos:7`, then install dependencies,
+such as `debian:11`, then install dependencies,
 and finally install the PowerShell package.
 
-These containers live at [hub.docker.com/r/microsoft/powershell][docker-release].
+These containers live at [Microsoft Artifact Registry][docker-release].
 
 At about 440 megabytes, they are decently minimal,
 with their size being the sum of the base image (200 megabytes)
 plus the uncompressed package (120 megabytes),
 and about 120 megabytes of .NET Core and bootstrapping dependencies.
 
-[docker-release]: https://hub.docker.com/r/microsoft/powershell/
+[docker-release]: [https://mcr.microsoft.com/powershell](https://mcr.microsoft.com/en-us/product/powershell/about)
 
 ## Community
 
diff --git a/vsts-ci.yml b/vsts-ci.yml
index eaa796fb5..53d1d167d 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -13,6 +13,7 @@ pr:
     - .github/*
     - .vsts-ci/releasebuild.yml
     - assets/matrix.json
+    - README.md
 
 resources:
 - repo: self

From 88ad0fe896541ae4fcfdbd9ecbba1d53cebb11a9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 Oct 2023 15:44:02 -0700
Subject: [PATCH 307/354] Remove EOL from distrobution info JSON/Yaml (#779)

---
 tools/buildHelper/buildHelper.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index dc4aa9e5e..1d63eb98c 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -192,7 +192,8 @@ class DockerImageMetaData {
                 $this.OsVersion = $this.OsVersion + ' (In Validation)'
             }
             'EndOfLife' {
-                $this.OsVersion = $this.OsVersion + ' (End of Life)'
+                # add this back if we get the EOL information to be accurate
+                # $this.OsVersion = $this.OsVersion + ' (End of Life)'
             }
         }
     }

From bd5fde89538b5772f35b96da14b8f330f59c58c1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 15 Nov 2023 16:32:04 -0800
Subject: [PATCH 308/354] Update channels for 7.4 GA (#780)

* Update channels.json

* Use UriBuilder to build Uri so that we always have a ?

* Change LTS back to 7.2
---
 .vsts-ci/releasePhase.yml       | 7 ++++---
 tools/buildHelper/channels.json | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
index e282c8b11..9e6afd5b8 100644
--- a/.vsts-ci/releasePhase.yml
+++ b/.vsts-ci/releasePhase.yml
@@ -104,7 +104,6 @@ jobs:
     displayName: 'docker login $(dockerHost)'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
 
-    
   - pwsh: |
       if($env:ACR -eq 'yes')
       {
@@ -138,7 +137,9 @@ jobs:
         $containerName = $containerName.Replace('.', '-')
         $context = New-AzStorageContext -StorageAccountName $(StorageAccount)
         $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
-        $url = "https://$(StorageAccount).blob.core.windows.net/$querystring"
+        $uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net")
+        $uriBuilder.Query = $querystring.ToString()
+        $url = $uriBuilder.ToString()
         Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
     condition: and( succeededOrFailed(), ne(variables['Channel'],''))
@@ -185,7 +186,7 @@ jobs:
     displayName: 'docker logout'
     condition: and( always(), ne(variables['Channel'],''))
 
-  - pwsh: | 
+  - pwsh: |
       if($env:ACR -eq 'yes')
       {
         Write-Host 'Using ACR, will need to az logout'
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index c23778e5b..6f611d981 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "stable",
-        "path": "release/7-3",
+        "path": "release/7-4",
         "pwshInstallVersion": "7",
         "packageTag": ""
     },

From 23d81a2f0e90882d75acb1cdcd51675a9e681c65 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Nov 2023 11:04:40 -0800
Subject: [PATCH 309/354] Update 7.4 Mariner images to use dotnet from PMC
 (#781)

* Create 7.5 channel for previews

* Update mariner 7-4 packages to use dotnet from PMC

* update the json to match the package
---
 release/7-4/mariner2-arm64/docker/Dockerfile  | 156 ++++++++--------
 release/7-4/mariner2-arm64/meta.json          |   2 +-
 release/7-4/mariner2/docker/Dockerfile        | 166 ++++++++----------
 release/7-5/alpine316/docker/Dockerfile       |  92 ++++++++++
 release/7-5/alpine316/meta.json               |  18 ++
 .../7-5/alpine316/test-deps/docker/Dockerfile |  35 ++++
 release/7-5/alpine316/test-deps/meta.json     |  16 ++
 release/7-5/alpine317/docker/Dockerfile       |  92 ++++++++++
 release/7-5/alpine317/meta.json               |  21 +++
 .../7-5/alpine317/test-deps/docker/Dockerfile |  37 ++++
 release/7-5/alpine317/test-deps/meta.json     |  16 ++
 release/7-5/debian11/docker/Dockerfile        |  96 ++++++++++
 release/7-5/debian11/meta.json                |  19 ++
 .../7-5/debian11/test-deps/docker/Dockerfile  |  24 +++
 release/7-5/debian11/test-deps/meta.json      |  16 ++
 release/7-5/debian12/docker/Dockerfile        | 102 +++++++++++
 release/7-5/debian12/meta.json                |  19 ++
 .../7-5/debian12/test-deps/docker/Dockerfile  |  24 +++
 release/7-5/debian12/test-deps/meta.json      |  16 ++
 release/7-5/mariner2-arm64/docker/Dockerfile  |  74 ++++++++
 release/7-5/mariner2-arm64/meta.json          |  21 +++
 release/7-5/mariner2/docker/Dockerfile        | 101 +++++++++++
 release/7-5/mariner2/meta.json                |  16 ++
 .../7-5/mariner2/test-deps/docker/Dockerfile  |  35 ++++
 release/7-5/mariner2/test-deps/meta.json      |  17 ++
 release/7-5/ubi8/docker/Dockerfile            |  59 +++++++
 release/7-5/ubi8/meta.json                    |  17 ++
 release/7-5/ubi8/test-deps/docker/Dockerfile  |  23 +++
 release/7-5/ubi8/test-deps/meta.json          |  20 +++
 release/7-5/ubi9/docker/Dockerfile            |  62 +++++++
 release/7-5/ubi9/meta.json                    |  21 +++
 release/7-5/ubi9/test-deps/docker/Dockerfile  |  23 +++
 release/7-5/ubi9/test-deps/meta.json          |  20 +++
 .../7-5/ubuntu20.04-arm32v7/docker/Dockerfile |  65 +++++++
 release/7-5/ubuntu20.04-arm32v7/meta.json     |  22 +++
 release/7-5/ubuntu20.04/docker/Dockerfile     |  97 ++++++++++
 release/7-5/ubuntu20.04/meta.json             |  19 ++
 .../ubuntu20.04/test-deps/docker/Dockerfile   |  23 +++
 release/7-5/ubuntu20.04/test-deps/meta.json   |  16 ++
 .../7-5/ubuntu22.04-arm32v7/docker/Dockerfile |  62 +++++++
 release/7-5/ubuntu22.04-arm32v7/meta.json     |  25 +++
 release/7-5/ubuntu22.04/docker/Dockerfile     |  95 ++++++++++
 release/7-5/ubuntu22.04/meta.json             |  21 +++
 .../ubuntu22.04/test-deps/docker/Dockerfile   |  23 +++
 release/7-5/ubuntu22.04/test-deps/meta.json   |  16 ++
 .../7-5/windowsserver2022/docker/Dockerfile   |  72 ++++++++
 release/7-5/windowsserver2022/meta.json       |  21 +++
 .../windowsservercore2022/docker/Dockerfile   |  72 ++++++++
 release/7-5/windowsservercore2022/meta.json   |  21 +++
 tools/buildHelper/channels.json               |   2 +-
 50 files changed, 1988 insertions(+), 160 deletions(-)
 create mode 100644 release/7-5/alpine316/docker/Dockerfile
 create mode 100644 release/7-5/alpine316/meta.json
 create mode 100644 release/7-5/alpine316/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/alpine316/test-deps/meta.json
 create mode 100644 release/7-5/alpine317/docker/Dockerfile
 create mode 100644 release/7-5/alpine317/meta.json
 create mode 100644 release/7-5/alpine317/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/alpine317/test-deps/meta.json
 create mode 100644 release/7-5/debian11/docker/Dockerfile
 create mode 100644 release/7-5/debian11/meta.json
 create mode 100644 release/7-5/debian11/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/debian11/test-deps/meta.json
 create mode 100644 release/7-5/debian12/docker/Dockerfile
 create mode 100644 release/7-5/debian12/meta.json
 create mode 100644 release/7-5/debian12/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/debian12/test-deps/meta.json
 create mode 100644 release/7-5/mariner2-arm64/docker/Dockerfile
 create mode 100644 release/7-5/mariner2-arm64/meta.json
 create mode 100644 release/7-5/mariner2/docker/Dockerfile
 create mode 100644 release/7-5/mariner2/meta.json
 create mode 100644 release/7-5/mariner2/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/mariner2/test-deps/meta.json
 create mode 100644 release/7-5/ubi8/docker/Dockerfile
 create mode 100644 release/7-5/ubi8/meta.json
 create mode 100644 release/7-5/ubi8/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/ubi8/test-deps/meta.json
 create mode 100644 release/7-5/ubi9/docker/Dockerfile
 create mode 100644 release/7-5/ubi9/meta.json
 create mode 100644 release/7-5/ubi9/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/ubi9/test-deps/meta.json
 create mode 100644 release/7-5/ubuntu20.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu20.04-arm32v7/meta.json
 create mode 100644 release/7-5/ubuntu20.04/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu20.04/meta.json
 create mode 100644 release/7-5/ubuntu20.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu20.04/test-deps/meta.json
 create mode 100644 release/7-5/ubuntu22.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu22.04-arm32v7/meta.json
 create mode 100644 release/7-5/ubuntu22.04/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu22.04/meta.json
 create mode 100644 release/7-5/ubuntu22.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu22.04/test-deps/meta.json
 create mode 100644 release/7-5/windowsserver2022/docker/Dockerfile
 create mode 100644 release/7-5/windowsserver2022/meta.json
 create mode 100644 release/7-5/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/7-5/windowsservercore2022/meta.json

diff --git a/release/7-4/mariner2-arm64/docker/Dockerfile b/release/7-4/mariner2-arm64/docker/Dockerfile
index de5c18ddc..2b7d76ac9 100644
--- a/release/7-4/mariner2-arm64/docker/Dockerfile
+++ b/release/7-4/mariner2-arm64/docker/Dockerfile
@@ -1,74 +1,90 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.4.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Define the folder we will be installing PowerShell to.
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
-
-# Create the install folder.
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    && tdnf install -y ca-certificates wget tar
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-# Unzip the linux powershell.tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ARG PS_VERSION=7.4.0-preview.1
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    tdnf update -y \
-    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
-    && tdnf upgrade -y \
-    && tdnf clean all
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.4.0
+    ARG PACKAGE_VERSION=7.4.0
+    ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.cm.aarch64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.4.0
+    ARG PS_INSTALL_VERSION=7
+
+    # Define Args and Env needed to create links
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        dotnet-runtime-8.0 \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
 
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-4/mariner2-arm64/meta.json b/release/7-4/mariner2-arm64/meta.json
index c586b4a90..69ddf55cc 100644
--- a/release/7-4/mariner2-arm64/meta.json
+++ b/release/7-4/mariner2-arm64/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-1.cm.aarch64.rpm",
     "osVersion": "Mariner 2.0 ARM 64v7",
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "mariner",
diff --git a/release/7-4/mariner2/docker/Dockerfile b/release/7-4/mariner2/docker/Dockerfile
index e50f17aed..2a79c2a79 100644
--- a/release/7-4/mariner2/docker/Dockerfile
+++ b/release/7-4/mariner2/docker/Dockerfile
@@ -3,99 +3,89 @@
 
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
 
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y mariner-repos-microsoft-preview \
-    && tdnf makecache
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
 
-# Move to
+# Download packages into a container so they don't take up space in the final stage
 FROM setup-tdnf-repa AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y \
-        wget \
-        awk \
-        tar \
-        ca-certificates
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PACKAGE_VERSION=7.3.0_preview.8
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    --mount=type=cache,target=/installTmp \
-    cd /installTmp \
-    && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
-    && chmod +x ./dotnet-install.sh \
-    && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
 
-RUN echo ${PS_PACKAGE_URL}
+    RUN echo ${PS_PACKAGE_URL}
 
-# Start a new stage so we lose all the tar.gz layers from the final image
+# Start a new stage so we lose all the package download layers from the final image
 FROM setup-tdnf-repa AS powershell
 
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    # install dependencies
-    tdnf install -y \
-    # required for localization
-    icu \
-    # required for help in PowerShell
-    less \
-    # required for SSH
-    openssh-clients \
-    ca-certificates
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all
-
-COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    rpm -i --nodeps /mnt/rpm/powershell.rpm
-
-# Create the pwsh symbolic link that points to powershell
-RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
-
-# intialize powershell module cache
-# and disable telemetry for this ONE session
-RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-            \$ErrorActionPreference = 'Stop' ; \
-            \$ProgressPreference = 'SilentlyContinue' ; \
-            while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-                Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-                Start-Sleep -Seconds 6 ; \
-            }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        dotnet-runtime-8.0 \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-5/alpine316/docker/Dockerfile b/release/7-5/alpine316/docker/Dockerfile
new file mode 100644
index 000000000..cfac28f6c
--- /dev/null
+++ b/release/7-5/alpine316/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.16
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine316/meta.json b/release/7-5/alpine316/meta.json
new file mode 100644
index 000000000..8216faee0
--- /dev/null
+++ b/release/7-5/alpine316/meta.json
@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.16",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.16"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-5/alpine316/test-deps/docker/Dockerfile b/release/7-5/alpine316/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c7585fba2
--- /dev/null
+++ b/release/7-5/alpine316/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine316/test-deps/meta.json b/release/7-5/alpine316/test-deps/meta.json
new file mode 100644
index 000000000..a8daf5955
--- /dev/null
+++ b/release/7-5/alpine316/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.16",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-5/alpine317/docker/Dockerfile b/release/7-5/alpine317/docker/Dockerfile
new file mode 100644
index 000000000..c6c3f950f
--- /dev/null
+++ b/release/7-5/alpine317/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.17
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine317/meta.json b/release/7-5/alpine317/meta.json
new file mode 100644
index 000000000..dd83a9823
--- /dev/null
+++ b/release/7-5/alpine317/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.17",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.17"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-5/alpine317/test-deps/docker/Dockerfile b/release/7-5/alpine317/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..f8d5d8113
--- /dev/null
+++ b/release/7-5/alpine317/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.17
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.17
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine317/test-deps/meta.json b/release/7-5/alpine317/test-deps/meta.json
new file mode 100644
index 000000000..f5a9899ab
--- /dev/null
+++ b/release/7-5/alpine317/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.17",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-5/debian11/docker/Dockerfile b/release/7-5/debian11/docker/Dockerfile
new file mode 100644
index 000000000..2abfd69a0
--- /dev/null
+++ b/release/7-5/debian11/docker/Dockerfile
@@ -0,0 +1,96 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bullseye-slim
+
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu67 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    # enable en_US.UTF-8 locale
+    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
+    # generate locale
+    && locale-gen && update-locale
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/debian11/meta.json b/release/7-5/debian11/meta.json
new file mode 100644
index 000000000..004ca8c80
--- /dev/null
+++ b/release/7-5/debian11/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Debian 11",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "debian",
+    "shortTags": [
+        {"Tag": "bullseye-slim"},
+        {"Tag": "11"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 340
+    },
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
+
diff --git a/release/7-5/debian11/test-deps/docker/Dockerfile b/release/7-5/debian11/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..a87eee790
--- /dev/null
+++ b/release/7-5/debian11/test-deps/docker/Dockerfile
@@ -0,0 +1,24 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/debian11/test-deps/meta.json b/release/7-5/debian11/test-deps/meta.json
new file mode 100644
index 000000000..a9999ce7b
--- /dev/null
+++ b/release/7-5/debian11/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 11 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 402
+    }
+}
diff --git a/release/7-5/debian12/docker/Dockerfile b/release/7-5/debian12/docker/Dockerfile
new file mode 100644
index 000000000..301af5d98
--- /dev/null
+++ b/release/7-5/debian12/docker/Dockerfile
@@ -0,0 +1,102 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+        tar \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-12
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu72 \
+        libssl3 \
+        libc6 \
+        libgcc-s1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-5/debian12/meta.json b/release/7-5/debian12/meta.json
new file mode 100644
index 000000000..b04681aa7
--- /dev/null
+++ b/release/7-5/debian12/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Debian 12",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "debian",
+    "shortTags": [
+        {"Tag": "bookworm"},
+        {"Tag": "12"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 490
+    },
+    "EndOfLife": "2025-12-25",
+    "DistributionState": "Validating"
+}
+
diff --git a/release/7-5/debian12/test-deps/docker/Dockerfile b/release/7-5/debian12/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..497c7ecae
--- /dev/null
+++ b/release/7-5/debian12/test-deps/docker/Dockerfile
@@ -0,0 +1,24 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-12
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-12
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/debian12/test-deps/meta.json b/release/7-5/debian12/test-deps/meta.json
new file mode 100644
index 000000000..c1f64c631
--- /dev/null
+++ b/release/7-5/debian12/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 12 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 490
+    }
+}
diff --git a/release/7-5/mariner2-arm64/docker/Dockerfile b/release/7-5/mariner2-arm64/docker/Dockerfile
new file mode 100644
index 000000000..de5c18ddc
--- /dev/null
+++ b/release/7-5/mariner2-arm64/docker/Dockerfile
@@ -0,0 +1,74 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.4.0-preview.1
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y \
+    && tdnf install -y ca-certificates wget tar
+
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+
+RUN ls -l /tmp/powershell.tar.gz
+
+# Unzip the linux powershell.tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.4.0-preview.1
+
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    tdnf update -y \
+    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
+    && tdnf upgrade -y \
+    && tdnf clean all
+
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/mariner2-arm64/meta.json b/release/7-5/mariner2-arm64/meta.json
new file mode 100644
index 000000000..c586b4a90
--- /dev/null
+++ b/release/7-5/mariner2-arm64/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm64.tar.gz",
+    "osVersion": "Mariner 2.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "mariner",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "2.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-12-14",
+    "DistributionState": "Validating",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}
diff --git a/release/7-5/mariner2/docker/Dockerfile b/release/7-5/mariner2/docker/Dockerfile
new file mode 100644
index 000000000..e50f17aed
--- /dev/null
+++ b/release/7-5/mariner2/docker/Dockerfile
@@ -0,0 +1,101 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y mariner-repos-microsoft-preview \
+    && tdnf makecache
+
+# Move to
+FROM setup-tdnf-repa AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y \
+        wget \
+        awk \
+        tar \
+        ca-certificates
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    --mount=type=cache,target=/installTmp \
+    cd /installTmp \
+    && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+    && chmod +x ./dotnet-install.sh \
+    && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
+
+RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    # install dependencies
+    tdnf install -y \
+    # required for localization
+    icu \
+    # required for help in PowerShell
+    less \
+    # required for SSH
+    openssh-clients \
+    ca-certificates
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf upgrade -y \
+    # clean cached data
+    && tdnf clean all
+
+COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+# Create the pwsh symbolic link that points to powershell
+RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+# intialize powershell module cache
+# and disable telemetry for this ONE session
+RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+            \$ErrorActionPreference = 'Stop' ; \
+            \$ProgressPreference = 'SilentlyContinue' ; \
+            while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                Start-Sleep -Seconds 6 ; \
+            }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/mariner2/meta.json b/release/7-5/mariner2/meta.json
new file mode 100644
index 000000000..a8c48a05c
--- /dev/null
+++ b/release/7-5/mariner2/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0",
+    "shortTags": [
+        {"Tag": "2.0"}
+    ],
+    "ShortDistroName": "mariner",
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 335
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-5/mariner2/test-deps/docker/Dockerfile b/release/7-5/mariner2/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..396f62ec6
--- /dev/null
+++ b/release/7-5/mariner2/test-deps/docker/Dockerfile
@@ -0,0 +1,35 @@
+# Docker image file that describes an Mariner image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:mariner
+FROM ${BaseImage}
+
+# To find which package provides a particular command, run:
+# tdnf install dnf-utils
+# dnf provides <command>
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf update -y --exclude=powershell-preview \
+    # install dependencies
+    && tdnf install -y \
+    dnf-utils \
+    sudo \
+    curl \
+    wget \
+    # provides ping and trace path
+    iputils \
+    # provides ps
+    procps-ng \
+    unzip \
+    git \
+    mariner-repos-microsoft-preview \
+    net-tools \
+    tar \
+    util-linux \
+    # clean cached data
+    && tdnf clean all
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/mariner2/test-deps/meta.json b/release/7-5/mariner2/test-deps/meta.json
new file mode 100644
index 000000000..222c298b0
--- /dev/null
+++ b/release/7-5/mariner2/test-deps/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0",
+    "tagTemplates": [
+        "mariner-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-redhat"
+    ],
+    "TestProperties": {
+        "size": 760
+    }
+}
diff --git a/release/7-5/ubi8/docker/Dockerfile b/release/7-5/ubi8/docker/Dockerfile
new file mode 100644
index 000000000..8bfa52029
--- /dev/null
+++ b/release/7-5/ubi8/docker/Dockerfile
@@ -0,0 +1,59 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    # ubi 8 security updates are not marked as security updates.
+    && yum upgrade -y \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/7-5/ubi8/meta.json b/release/7-5/ubi8/meta.json
new file mode 100644
index 000000000..9639070ce
--- /dev/null
+++ b/release/7-5/ubi8/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 8",
+    "ShortDistroName": "ubi",
+    "shortTags": [
+        {"Tag": "8"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 625
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-5/ubi8/test-deps/docker/Dockerfile b/release/7-5/ubi8/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c4df646c2
--- /dev/null
+++ b/release/7-5/ubi8/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps-ng \
+        git \
+        unzip \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubi8/test-deps/meta.json b/release/7-5/ubi8/test-deps/meta.json
new file mode 100644
index 000000000..590284827
--- /dev/null
+++ b/release/7-5/ubi8/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 8",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "8"}
+    ],
+    "tagTemplates": [
+        "ubi-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 750
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-5/ubi9/docker/Dockerfile b/release/7-5/ubi9/docker/Dockerfile
new file mode 100644
index 000000000..04a96136c
--- /dev/null
+++ b/release/7-5/ubi9/docker/Dockerfile
@@ -0,0 +1,62 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi9/ubi AS installer-env
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi9/ubi AS final-image
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      openssl \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    && yum upgrade -y \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
+    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
+    # Fixed in https://github.com/dotnet/runtime/pull/69668
+    OPENSSL_ENABLE_SHA1_SIGNATURES=1
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/7-5/ubi9/meta.json b/release/7-5/ubi9/meta.json
new file mode 100644
index 000000000..cf260a311
--- /dev/null
+++ b/release/7-5/ubi9/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 9",
+    "ShortDistroName": "ubi",
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "manifestLists": [
+        "ubi${channelTagPostfix}",
+        "${channelTagPrefix}ubi"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 508
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-5/ubi9/test-deps/docker/Dockerfile b/release/7-5/ubi9/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..3ec04a1d8
--- /dev/null
+++ b/release/7-5/ubi9/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        hostname \
+        iputils \
+        procps-ng \
+        git \
+        unzip \
+    && yum clean all \
+    && yum upgrade -y \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubi9/test-deps/meta.json b/release/7-5/ubi9/test-deps/meta.json
new file mode 100644
index 000000000..a0efea4fd
--- /dev/null
+++ b/release/7-5/ubi9/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 9",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "tagTemplates": [
+        "ubi-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 566
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-5/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-5/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..82537653b
--- /dev/null
+++ b/release/7-5/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,65 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS installer-env
+
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+    ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+    # define the folder we will be installing PowerShell to
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+    # Create the install folder
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+    ARG PS_PACKAGE_URL_BASE64
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates wget --yes
+    RUN update-ca-certificates -f
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+    RUN ls -l /tmp/powershell.tar.gz
+        # Unzip the Linux tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates libssl1.1 libicu66 less --yes
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+        # Create the pwsh-preview symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-5/ubuntu20.04-arm32v7/meta.json b/release/7-5/ubuntu20.04-arm32v7/meta.json
new file mode 100644
index 000000000..5e5d0ee14
--- /dev/null
+++ b/release/7-5/ubuntu20.04-arm32v7/meta.json
@@ -0,0 +1,22 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 20.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "focal-arm32"},
+        {"Tag": "20.04-arm32"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm32"
+}
diff --git a/release/7-5/ubuntu20.04/docker/Dockerfile b/release/7-5/ubuntu20.04/docker/Dockerfile
new file mode 100644
index 000000000..de0d3b08f
--- /dev/null
+++ b/release/7-5/ubuntu20.04/docker/Dockerfile
@@ -0,0 +1,97 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-5/ubuntu20.04/meta.json b/release/7-5/ubuntu20.04/meta.json
new file mode 100644
index 000000000..84124cdae
--- /dev/null
+++ b/release/7-5/ubuntu20.04/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "TestProperties": {
+        "size": 340
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated",
+    "UseInCi": false
+}
diff --git a/release/7-5/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-5/ubuntu20.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..bf15fd900
--- /dev/null
+++ b/release/7-5/ubuntu20.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubuntu20.04/test-deps/meta.json b/release/7-5/ubuntu20.04/test-deps/meta.json
new file mode 100644
index 000000000..b3ecab356
--- /dev/null
+++ b/release/7-5/ubuntu20.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 410
+    }
+}
diff --git a/release/7-5/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-5/ubuntu22.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..01779bf8d
--- /dev/null
+++ b/release/7-5/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,62 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS installer-env
+
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+ARG PS_PACKAGE_URL_BASE64
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+RUN ls -l /tmp/powershell.tar.gz
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libssl3 libicu70 less --yes
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubuntu22.04-arm32v7/meta.json b/release/7-5/ubuntu22.04-arm32v7/meta.json
new file mode 100644
index 000000000..e846f4518
--- /dev/null
+++ b/release/7-5/ubuntu22.04-arm32v7/meta.json
@@ -0,0 +1,25 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 22.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "jammy-arm32"},
+        {"Tag": "22.04-arm32"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm32"
+}
diff --git a/release/7-5/ubuntu22.04/docker/Dockerfile b/release/7-5/ubuntu22.04/docker/Dockerfile
new file mode 100644
index 000000000..94ca415ee
--- /dev/null
+++ b/release/7-5/ubuntu22.04/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-22.04
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu70 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-5/ubuntu22.04/meta.json b/release/7-5/ubuntu22.04/meta.json
new file mode 100644
index 000000000..647fa3c84
--- /dev/null
+++ b/release/7-5/ubuntu22.04/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Ubuntu 22.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "TestProperties": {
+        "size": 338
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-5/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-5/ubuntu22.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..46f14f92a
--- /dev/null
+++ b/release/7-5/ubuntu22.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-22.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-22.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubuntu22.04/test-deps/meta.json b/release/7-5/ubuntu22.04/test-deps/meta.json
new file mode 100644
index 000000000..c488d53c1
--- /dev/null
+++ b/release/7-5/ubuntu22.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 22.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 390
+    }
+}
diff --git a/release/7-5/windowsserver2022/docker/Dockerfile b/release/7-5/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/7-5/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-5/windowsserver2022/meta.json b/release/7-5/windowsserver2022/meta.json
new file mode 100644
index 000000000..de7049fef
--- /dev/null
+++ b/release/7-5/windowsserver2022/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "ShortDistroName": "windowsserver",
+    "manifestLists": [
+        "${channelTagPrefix}windowsserver"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-5/windowsservercore2022/docker/Dockerfile b/release/7-5/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..1a165d3e0
--- /dev/null
+++ b/release/7-5/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-5/windowsservercore2022/meta.json b/release/7-5/windowsservercore2022/meta.json
new file mode 100644
index 000000000..a1b9c11ce
--- /dev/null
+++ b/release/7-5/windowsservercore2022/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "Base64EncodePackageUrl": true,
+    "ShortDistroName": "windowsservercore",
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index 6f611d981..12a3997b8 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -7,7 +7,7 @@
     },
     {
         "name": "preview",
-        "path": "release/7-4",
+        "path": "release/7-5",
         "tagPrefix": "preview",
         "pwshInstallVersion": "7-preview",
         "packageTag": "-preview"

From 124ef9f7ce5316a0f63f627ef9f4f96f2111aa43 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Nov 2023 11:55:51 -0800
Subject: [PATCH 310/354] Fix TDNF caching issues (#782)

---
 release/7-3/mariner2-arm64/docker/Dockerfile | 140 +++++++++----------
 release/7-4/mariner2-arm64/docker/Dockerfile |   4 +-
 release/7-4/mariner2/docker/Dockerfile       |   5 +-
 3 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/release/7-3/mariner2-arm64/docker/Dockerfile b/release/7-3/mariner2-arm64/docker/Dockerfile
index 52e3e6a49..86bb1d823 100644
--- a/release/7-3/mariner2-arm64/docker/Dockerfile
+++ b/release/7-3/mariner2-arm64/docker/Dockerfile
@@ -1,73 +1,73 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Define the folder we will be installing PowerShell to.
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
-
-# Create the install folder.
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    && tdnf install -y ca-certificates wget tar
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-# Unzip the linux powershell.tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ARG PS_VERSION=7.3.1
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    tdnf update -y \
-    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
-    && tdnf upgrade -y \
-    && tdnf clean all
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.3.1
+    ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # Define the folder we will be installing PowerShell to.
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+    # Create the install folder.
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+    ARG PS_PACKAGE_URL_BASE64
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf update -y \
+        && tdnf install -y ca-certificates wget tar
+
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+
+    RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the linux powershell.tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7
+    ARG PS_VERSION=7.3.1
+
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        tdnf update -y \
+        && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
+        && tdnf upgrade -y \
+        && tdnf clean all
+
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-4/mariner2-arm64/docker/Dockerfile b/release/7-4/mariner2-arm64/docker/Dockerfile
index 2b7d76ac9..4add4590e 100644
--- a/release/7-4/mariner2-arm64/docker/Dockerfile
+++ b/release/7-4/mariner2-arm64/docker/Dockerfile
@@ -20,8 +20,8 @@ FROM setup-tdnf-repa AS installer-env
     # Download the Linux tar.gz and save it
     ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
-    RUN --mount=type=cache,target=/var/cache/tdnf \
-        tdnf install -y \
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
             wget \
             awk \
             tar \
diff --git a/release/7-4/mariner2/docker/Dockerfile b/release/7-4/mariner2/docker/Dockerfile
index 2a79c2a79..095a9ad0a 100644
--- a/release/7-4/mariner2/docker/Dockerfile
+++ b/release/7-4/mariner2/docker/Dockerfile
@@ -3,6 +3,7 @@
 
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
 
+    # Use the cache mount since this image does go into the final product
     RUN --mount=type=cache,target=/var/cache/tdnf \
         tdnf install -y mariner-repos-microsoft-preview \
         && tdnf makecache
@@ -20,8 +21,8 @@ FROM setup-tdnf-repa AS installer-env
     # Download the Linux tar.gz and save it
     ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
-    RUN --mount=type=cache,target=/var/cache/tdnf \
-        tdnf install -y \
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
             wget \
             awk \
             tar \

From 5568c1494e0dadd3bdf8af383e240bae21fefb09 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:04:51 -0800
Subject: [PATCH 311/354] Update the release build yaml with the latest
 versions (#783)

---
 .vsts-ci/releasebuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index 61fc06193..c0ce8bd1e 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -4,9 +4,9 @@ parameters:
   - name: 'previewReleaseTag'
     default: 'v7.4.0-rc.1'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.16'
+    default: 'v7.2.17'
   - name: 'stableReleaseTag'
-    default: 'v7.3.9'
+    default: 'v7.4.0'
 
 resources:
 - repo: self

From 3427ddf56584c363300a9d212d7db095ff36b771 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Nov 2023 13:57:08 -0800
Subject: [PATCH 312/354] Sync Mariner changes from 7-4 to 7-5 (#784)

* Sync changes from 7-4

* Update release/7-5/mariner2-arm64/docker/Dockerfile
---
 release/7-5/mariner2-arm64/docker/Dockerfile | 142 ++++++++--------
 release/7-5/mariner2/docker/Dockerfile       | 165 ++++++++++---------
 2 files changed, 154 insertions(+), 153 deletions(-)

diff --git a/release/7-5/mariner2-arm64/docker/Dockerfile b/release/7-5/mariner2-arm64/docker/Dockerfile
index de5c18ddc..7bb19a68d 100644
--- a/release/7-5/mariner2-arm64/docker/Dockerfile
+++ b/release/7-5/mariner2-arm64/docker/Dockerfile
@@ -1,74 +1,74 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.4.0-preview.1
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Define the folder we will be installing PowerShell to.
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
-
-# Create the install folder.
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-ARG PS_PACKAGE_URL_BASE64
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    && tdnf install -y ca-certificates wget tar
-
-RUN echo 'in task' \
-    && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
-        echo 'using base64' \
-        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
-    else \
-        echo 'using unencoded' \
-        && export url="${PS_PACKAGE_URL}"; \
-    fi \
-    && echo "url: $url" \
-    && wget -O /tmp/powershell.tar.gz "$url" \
-    && echo 'task done'
-
-RUN ls -l /tmp/powershell.tar.gz
-
-# Unzip the linux powershell.tar.gz
-RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20221222-arm64 AS final-image
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ARG PS_VERSION=7.4.0-preview.1
-
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    tdnf update -y \
-    && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
-    && tdnf upgrade -y \
-    && tdnf clean all
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-eng
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.4.0-preview.1
+    ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define the folder we will be installing PowerShell to.
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+    # Create the install folder.
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+    ARG PS_PACKAGE_URL_BASE64
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf update -y \
+        && tdnf install -y ca-certificates wget tar
+
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+
+    RUN ls -l /tmp/powershell.tar.gz
+
+    # Unzip the linux powershell.tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ARG PS_VERSION=7.4.0-preview.1
+
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        tdnf update -y \
+        && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
+        && tdnf upgrade -y \
+        && tdnf clean all
+
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-5/mariner2/docker/Dockerfile b/release/7-5/mariner2/docker/Dockerfile
index e50f17aed..885c0bf7f 100644
--- a/release/7-5/mariner2/docker/Dockerfile
+++ b/release/7-5/mariner2/docker/Dockerfile
@@ -3,99 +3,100 @@
 
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
 
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y mariner-repos-microsoft-preview \
-    && tdnf makecache
+    # Use the cache mount since this image does go into the final product
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
 
-# Move to
+# Download packages into a container so they don't take up space in the final stage
 FROM setup-tdnf-repa AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PACKAGE_VERSION=7.3.0_preview.8
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
 
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf install -y \
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
         wget \
         awk \
         tar \
         ca-certificates
 
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    --mount=type=cache,target=/installTmp \
-    cd /installTmp \
-    && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
-    && chmod +x ./dotnet-install.sh \
-    && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
 
-RUN echo ${PS_PACKAGE_URL}
+    RUN echo ${PS_PACKAGE_URL}
 
-# Start a new stage so we lose all the tar.gz layers from the final image
+# Start a new stage so we lose all the package download layers from the final image
 FROM setup-tdnf-repa AS powershell
 
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    # install dependencies
-    tdnf install -y \
-    # required for localization
-    icu \
-    # required for help in PowerShell
-    less \
-    # required for SSH
-    openssh-clients \
-    ca-certificates
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf upgrade -y \
-    # clean cached data
-    && tdnf clean all
-
-COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
-
-RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    rpm -i --nodeps /mnt/rpm/powershell.rpm
-
-# Create the pwsh symbolic link that points to powershell
-RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
-
-# intialize powershell module cache
-# and disable telemetry for this ONE session
-RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-            \$ErrorActionPreference = 'Stop' ; \
-            \$ProgressPreference = 'SilentlyContinue' ; \
-            while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-                Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-                Start-Sleep -Seconds 6 ; \
-            }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]

From 53d9e2febc1ec38b87ac09119ec52ea7c72a8d3a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Nov 2023 14:57:02 -0800
Subject: [PATCH 313/354] Fix typo in stage name (#785)

---
 release/7-5/mariner2-arm64/docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/7-5/mariner2-arm64/docker/Dockerfile b/release/7-5/mariner2-arm64/docker/Dockerfile
index 7bb19a68d..23e28acd1 100644
--- a/release/7-5/mariner2-arm64/docker/Dockerfile
+++ b/release/7-5/mariner2-arm64/docker/Dockerfile
@@ -1,10 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-eng
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
     # Define Args for the needed to add the package
-    ARG PS_VERSION=7.4.0-preview.1
+    ARG PS_VERSION=7.4.0-rc.1
     ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
     ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
     ARG PS_INSTALL_VERSION=7-preview
@@ -42,7 +42,7 @@ FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final
 
     # Define Args and Env needed to create links
     ARG PS_INSTALL_VERSION=7-preview
-    ARG PS_VERSION=7.4.0-preview.1
+    ARG PS_VERSION=7.4.0-rc.1
 
     ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
         \

From db53f82b1057220b78ef189f79de18c6d8a92544 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 1 Feb 2024 14:56:19 -0800
Subject: [PATCH 314/354] Update meta.json for mariner2-arm64 (#791)

---
 release/7-3/mariner2-arm64/meta.json   | 4 +---
 release/7-4/mariner2-arm64/meta.json   | 4 +---
 release/7-5/mariner2-arm64/meta.json   | 4 +---
 release/7-5/mariner2/docker/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/release/7-3/mariner2-arm64/meta.json b/release/7-3/mariner2-arm64/meta.json
index 70a0f00f6..968a7529c 100644
--- a/release/7-3/mariner2-arm64/meta.json
+++ b/release/7-3/mariner2-arm64/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Mariner 2.0 ARM 64v7",
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "mariner",
-    "Base64EncodePackageUrl": true,
-    "UseAcr": false,
     "shortTags": [
         {"Tag": "2.0-arm64"}
     ],
@@ -15,7 +13,7 @@
         "Arm32": true
     },
     "EndOfLife": "2023-12-14",
-    "DistributionState": "Validating",
+    "DistributionState": "Validated",
     "UseInCi": false,
     "Architecture": "arm64"
 }
diff --git a/release/7-4/mariner2-arm64/meta.json b/release/7-4/mariner2-arm64/meta.json
index 69ddf55cc..5d6cb3ccb 100644
--- a/release/7-4/mariner2-arm64/meta.json
+++ b/release/7-4/mariner2-arm64/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Mariner 2.0 ARM 64v7",
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "mariner",
-    "Base64EncodePackageUrl": true,
-    "UseAcr": false,
     "shortTags": [
         {"Tag": "2.0-arm64"}
     ],
@@ -15,7 +13,7 @@
         "Arm32": true
     },
     "EndOfLife": "2023-12-14",
-    "DistributionState": "Validating",
+    "DistributionState": "Validated",
     "UseInCi": false,
     "Architecture": "arm64"
 }
diff --git a/release/7-5/mariner2-arm64/meta.json b/release/7-5/mariner2-arm64/meta.json
index c586b4a90..7c0fd8cfc 100644
--- a/release/7-5/mariner2-arm64/meta.json
+++ b/release/7-5/mariner2-arm64/meta.json
@@ -5,8 +5,6 @@
     "osVersion": "Mariner 2.0 ARM 64v7",
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "mariner",
-    "Base64EncodePackageUrl": true,
-    "UseAcr": false,
     "shortTags": [
         {"Tag": "2.0-arm64"}
     ],
@@ -15,7 +13,7 @@
         "Arm32": true
     },
     "EndOfLife": "2023-12-14",
-    "DistributionState": "Validating",
+    "DistributionState": "Validated",
     "UseInCi": false,
     "Architecture": "arm64"
 }
diff --git a/release/7-5/mariner2/docker/Dockerfile b/release/7-5/mariner2/docker/Dockerfile
index 885c0bf7f..1398e85fc 100644
--- a/release/7-5/mariner2/docker/Dockerfile
+++ b/release/7-5/mariner2/docker/Dockerfile
@@ -33,7 +33,7 @@ FROM setup-tdnf-repa AS installer-env
         cd /installTmp \
         && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
         && chmod +x ./dotnet-install.sh \
-        && ./dotnet-install.sh -Channel 8.0 -Quality preview -Runtime dotnet -InstallDir /usr/share/dotnet
+        && ./dotnet-install.sh -Channel 8.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
 
     RUN echo ${PS_PACKAGE_URL}
 

From 356f0818e99f7b2198fe496d28443d51dda6192f Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Fri, 23 Feb 2024 15:48:28 -0500
Subject: [PATCH 315/354] update dotnet channel to 9.0 so that powershell
 preview can find dotnet version it needs (#794)

---
 release/7-5/mariner2/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/7-5/mariner2/docker/Dockerfile b/release/7-5/mariner2/docker/Dockerfile
index 1398e85fc..e38a3ed56 100644
--- a/release/7-5/mariner2/docker/Dockerfile
+++ b/release/7-5/mariner2/docker/Dockerfile
@@ -33,7 +33,7 @@ FROM setup-tdnf-repa AS installer-env
         cd /installTmp \
         && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
         && chmod +x ./dotnet-install.sh \
-        && ./dotnet-install.sh -Channel 8.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
 
     RUN echo ${PS_PACKAGE_URL}
 

From 1a63476be2ae5840b5b8493daf024a9ce909f27a Mon Sep 17 00:00:00 2001
From: StepSecurity Bot <bot@stepsecurity.io>
Date: Tue, 16 Apr 2024 12:52:15 -0700
Subject: [PATCH 316/354] [StepSecurity] Apply security best practices (#801)

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>
---
 .github/workflows/createReminder.yml    |  2 +-
 .github/workflows/dependency-review.yml | 22 ++++++++++++++++++++++
 .github/workflows/processReminders.yml  |  2 +-
 .github/workflows/update.yml            | 10 +++++-----
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/dependency-review.yml

diff --git a/.github/workflows/createReminder.yml b/.github/workflows/createReminder.yml
index 79f8a30bb..93bfac7bc 100644
--- a/.github/workflows/createReminder.yml
+++ b/.github/workflows/createReminder.yml
@@ -13,4 +13,4 @@ jobs:
 
     steps:
       - name: check for reminder
-        uses: agrc/create-reminder-action@v1
+        uses: agrc/create-reminder-action@922893a5705067719c4c4751843962f56aabf5eb # v1.1.13
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000..a52521621
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,22 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c # v2.5.1
diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
index 9bf1a17a6..d7c1ea966 100644
--- a/.github/workflows/processReminders.yml
+++ b/.github/workflows/processReminders.yml
@@ -14,4 +14,4 @@ jobs:
 
     steps:
       - name: check reminders and notify
-        uses: agrc/reminder-action@v1
+        uses: agrc/reminder-action@e59091b4e9705a6108120cb50823108df35b5392 # v1.0.12
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index df911b167..713d461a6 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -26,7 +26,7 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
 
       - name: Auto-update formula
         run: |
@@ -34,7 +34,7 @@ jobs:
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v4.2.4
         with:
           token: "${{ secrets.PR_PAT }}"
           commit-message: "Update the release build yaml with the latest versions"
@@ -54,10 +54,10 @@ jobs:
       contents: write  # for peter-evans/create-pull-request to create branch
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
         with:
           node-version: 18.x
 
@@ -68,7 +68,7 @@ jobs:
       - name: Create Pull Request
         if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v4.2.4
         with:
           token: "${{ secrets.PR_PAT }}"
           commit-message: "Update the matrix json"

From 11d246c894f6b434ad7c598b1abbc14c6e300f14 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 18 Apr 2024 13:34:08 -0700
Subject: [PATCH 317/354] Add github-actions and broaden scope of dependabot

---
 .github/dependabot.yml | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e9c29b21a..31484d28a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,31 +3,11 @@ version: 2
 # update_schedule: live is not supported by docker
 
   - package-ecosystem: "docker"
-    directory: "/release/7-3/alpine314/docker"
+    directory: "/release/*"
     schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/7-3/centos8/dependabot"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/7-3/debian11/dependabot"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/7-3/nanoserver20H2/dependabot"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/7-3/ubuntu20.04/docker"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/release/community-stable/oraclelinux/docker"
+      interval: "daily"
+      
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       interval: "weekly"

From 744090c54337a60e6c7f9fe04a2bf94230425b13 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:35:45 -0700
Subject: [PATCH 318/354] Update the release build yaml with the latest
 versions (#786)

* Update the release build yaml with the latest versions

* Update .vsts-ci/releasebuild.yml

---------

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .vsts-ci/releasebuild.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
index c0ce8bd1e..d24fe808c 100644
--- a/.vsts-ci/releasebuild.yml
+++ b/.vsts-ci/releasebuild.yml
@@ -2,11 +2,11 @@ name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
 
 parameters:
   - name: 'previewReleaseTag'
-    default: 'v7.4.0-rc.1'
+    default: 'v7.5.0-preview.2'
   - name: 'ltsReleaseTag'
-    default: 'v7.2.17'
+    default: 'v7.2.19'
   - name: 'stableReleaseTag'
-    default: 'v7.4.0'
+    default: 'v7.4.1'
 
 resources:
 - repo: self

From 1fce34a68894e047eb6e16fb051a672e1627c44f Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 24 Apr 2024 16:31:59 -0400
Subject: [PATCH 319/354] Script populate yaml (#803)

* add script and markdown file

* fix typo in md file

* add copyright header
---
 build.ps1                              | 62 +++++++++++++++++--
 tools/buildHelper/buildHelper.psm1     | 86 ++++++++++++++++++++++++++
 tools/updateYamls/updateBuildYamls.ps1 | 85 +++++++++++++++++++++++++
 tools/updateYamls/updateYamls.md       | 15 +++++
 4 files changed, 243 insertions(+), 5 deletions(-)
 create mode 100644 tools/updateYamls/updateBuildYamls.ps1
 create mode 100644 tools/updateYamls/updateYamls.md

diff --git a/build.ps1 b/build.ps1
index b98e2a5fd..7f44828e3 100755
--- a/build.ps1
+++ b/build.ps1
@@ -34,6 +34,10 @@ param(
     [switch]
     $GenerateMatrixJson,
 
+    [Parameter(Mandatory, ParameterSetName="UpdateBuildYaml")]
+    [switch]
+    $UpdateBuildYaml,
+
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [switch]
     $FullJson,
@@ -108,6 +112,7 @@ param(
     $Version,
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -115,6 +120,7 @@ param(
     $StableVersion,
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -122,6 +128,7 @@ param(
     $LtsVersion,
 
     [Parameter(ParameterSetName="GenerateManifestLists")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -129,6 +136,7 @@ param(
     $PreviewVersion,
 
     [Parameter(ParameterSetName="GenerateManifestLists")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -147,12 +155,14 @@ param(
     $ForcePesterInstall,
 
     [Parameter(ParameterSetName="GenerateManifestLists")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [string]
     [ValidateSet('All','OnlyAcr','NoAcr')]
     $Acr,
 
     [Parameter(ParameterSetName="GenerateManifestLists")]
+    [Parameter(ParameterSetName="UpdateBuildYaml")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [string]
     [ValidateSet('All','Linux','Windows')]
@@ -203,6 +213,7 @@ DynamicParam {
     Add-ParameterAttribute -ParameterSetName 'GetTagsByChannel' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'DupeCheck' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GenerateMatrixJson' -Attributes $channelAttributes -Mandatory $false
+    Add-ParameterAttribute -ParameterSetName "UpdateBuildYaml" -Attributes $channelAttributes -Mandatory $false
     Add-ParameterAttribute -ParameterSetName 'GenerateTagsYaml' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GenerateManifestLists' -Attributes $channelAttributes
 
@@ -227,7 +238,7 @@ Begin {
 
     $ENV:DOCKER_BUILDKIT = 1
 
-    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
+    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'UpdateBuildYaml', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
     }
@@ -404,7 +415,7 @@ End {
                     }
                 }
             }
-            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent -or $GenerateManifestLists.IsPresent) {
+            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $GenerateManifestLists.IsPresent) {
                 if($Acr -eq 'OnlyAcr' -and !$useAcr)
                 {
                     continue
@@ -437,7 +448,7 @@ End {
 
                 $osVersion = $allMeta.meta.osVersion
                 $manifestLists = $allMeta.meta.ManifestLists
-                if($osVersion -or $GenerateMatrixJson.IsPresent -or $GenerateManifestLists.IsPresent)
+                if($osVersion -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $GenerateManifestLists.IsPresent)
                 {
                     if ($osVersion) {
                         $osVersion = $osVersion.replace('${fromTag}', $actualTagData.fromTag)
@@ -525,8 +536,8 @@ End {
         Invoke-PesterWrapper -Script $testsPath -OutputFile $logPath -ExtraParams $extraParams
     }
 
-    Write-Verbose "!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$GenerateManifestLists -and '$($PSCmdlet.ParameterSetName)' -notlike '*All'" -Verbose
-    if (!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$GenerateManifestLists -and $PSCmdlet.ParameterSetName -notlike '*All') {
+    Write-Verbose "!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$GenerateManifestLists -and '$($PSCmdlet.ParameterSetName)' -notlike '*All'" -Verbose
+    if (!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$GenerateManifestLists -and $PSCmdlet.ParameterSetName -notlike '*All') {
         $dockerImagesToScan = ''
         # print local image names
         # used only with the -Build
@@ -665,6 +676,47 @@ End {
         }
     }
 
+    $channelsUsed = @{}
+    if ($UpdateBuildYaml.IsPresent) {
+        foreach ($repo in $tagGroups.Keys | Sort-Object) {
+            $channelGroups = $tagGroups.$repo | Group-Object -Property Channel
+            foreach($channelGroup in $channelGroups)
+            {
+                $channelName = $channelGroup.Name
+                $ciFolder = Join-Path -Path $PSScriptRoot -ChildPath '.vsts-ci'
+                $channelReleaseStagePath = Join-Path -Path $ciFolder -ChildPath "$($channelName)ReleaseStage.yml"
+
+                if (!$channelsUsed.Contains($channelName))
+                {
+                    # Note: channelGroup contains entry for a channels' regular and channel's test-deps images.
+                    # But, we only want 1 <channel>ReleaseStage.yml file to be created per channel (ie 1 stableReleaseStage.yml) so only populate start of yaml file once per channel.
+                    $channelReleaseStageFileExists = Test-Path $channelReleaseStagePath
+                    if ($channelReleaseStageFileExists)
+                    {
+                        Remove-Item -Path $channelReleaseStagePath
+                    }
+
+                    New-Item -Type File -Path $channelReleaseStagePath
+    
+                    Get-StartOfYamlPopulated -Channel $channelName -YamlFilePath $channelReleaseStagePath
+                    $channelsUsed.Add($channelName, $channelGroup.Values)
+                }
+
+                $osGroups = $channelGroup.Group | Group-Object -Property os
+                foreach ($osGroup in $osGroups) {
+                    $architectureGroups = $osGroup.Group | Group-Object -Property Architecture
+                    foreach ($architectureGroup in $architectureGroups) {
+                        # Note: For each image to be built (including test-deps images) the <channel>ReleaseStage.yml file needs to have a template call for the image.
+                        foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
+                            Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
+                            Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     if ($GenerateManifestLists.IsPresent) {
         $manifestLists = @()
         $tags = @()
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 1d63eb98c..85bc26d1b 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1030,3 +1030,89 @@ Function ConvertTo-SortedDictionary {
     }
     return $sortedDictionary
 }
+
+function Get-StartOfYamlPopulated {
+    param(
+        [string]
+        $Channel,
+
+        [string]
+        $YamlFilePath
+    )
+
+    if (!$YamlFilePath)
+    {
+        throw "Yaml file $YamlFilePath provided as parameter cannot be found."
+    }
+    
+    $doubleSpace = " "*2
+
+    Add-Content -Path $YamlFilePath -Value "parameters:"
+    Add-Content -Path $YamlFilePath -Value "- name: channel"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)default: 'preview'"
+    Add-Content -Path $YamlFilePath -Value "- name: channelPath"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)default: ''"
+    Add-Content -Path $YamlFilePath -Value "- name: vmImage"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)default: PSMMSUbuntu20.04-Secure"
+    Add-Content -Path $YamlFilePath -Value "stages:"
+    Add-Content -Path $YamlFilePath -Value "- stage: StageGenerateBuild_$Channel"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)dependsOn: ['StageResolveVersionandYaml']"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)displayName: Build $Channel"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)jobs:"
+}
+
+function Get-TemplatePopulatedYaml {
+    param(
+        [string]
+        $YamlFilePath,
+
+        [psobject]
+        $ImageInfo
+    )
+
+    if (!$YamlFilePath)
+    {
+        throw "Yaml file $YamlFilePath provided as parameter cannot be found."
+    }
+
+    $doubleSpace = " "*2
+    $fourSpace = " "*4
+    $sixSpace = " "*6
+
+    $imageName = $ImageInfo.Name
+    $artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_")
+    $architecture = $ImageInfo.Architecture
+    $poolOS = $ImageInfo.IsLinux ? "linux" : "windows"
+    $archBasedJobName = "Build_$($poolOS)_$($architecture)"
+
+    if ($architecture -eq "arm32")
+    {
+        $architecture = "arm64" # we need to use hostArchicture arm64 for pool for arm32
+    }
+
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)- template: /.vsts-ci/releasePhase.yml@self"
+    Add-Content -Path $YamlFilePath -Value "$($fourSpace)parameters:"
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)archName: '$archBasedJobName'" # ie: Build_Linux_arm32
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)imageName: $imageName" # ie. imageName: alpine317\test-deps (since this differs from artifactSuffix for test-deps images only, we have a separate entry as the yaml param)
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)artifactSuffix: $artifactSuffix" # i.e artifactSuffix: alpine317_test_deps 
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolOS: '$poolOS'"
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
+    if ($poolOS -eq "linux")
+    {
+        # only need to specify buildKitValue=1 for linux
+        Add-Content -Path $YamlFilePath -Value "$($sixSpace)buildKitValue: 1"
+    }
+    else
+    {
+        if ($imageName -contains "2022")
+        {
+            Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
+            Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"
+        }
+
+        Add-Content -Path $YamlFilePath -Value "$($sixSpace)maxParallel: 3"
+    }
+
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)channel: `${{ parameters.channel }}"
+    Add-Content -Path $YamlFilePath -Value "$($sixSpace)channelPath: `${{ parameters.channelPath }}"
+}
diff --git a/tools/updateYamls/updateBuildYamls.ps1 b/tools/updateYamls/updateBuildYamls.ps1
new file mode 100644
index 000000000..ebbb51853
--- /dev/null
+++ b/tools/updateYamls/updateBuildYamls.ps1
@@ -0,0 +1,85 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+    [string]
+    $StableVersion,
+
+    [string]
+    $PreviewVersion,
+
+    [string]
+    $LtsVersion
+)
+
+if (!($stableVersion -eq ""))
+{
+  if ($stableVersion -notmatch '\d+\.\d+\.\d+$') {
+    throw "stable release tag is not for a stable build: '$stableVersion'"
+  }
+}
+
+if (!($previewVersion -eq ""))
+{
+  if ($previewVersion -notmatch '\d+\.\d+\.\d+-(preview|rc)\.\d+$') {
+    throw "preview release tag is not for a preview build: '$previewVersion'"
+  }
+}
+
+if (!($ltsVersion -eq ""))
+{
+  if ($ltsVersion -notmatch '\d+\.\d+\.\d+$') {
+    throw "lts release tag is not for a lts build: '$ltsVersion'"
+  }
+}
+
+function Update-ChannelReleaseStageYaml {
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet('stable', 'preview', 'lts')]
+        [string]
+        $Channel,
+
+        [string]
+        $Version
+    )
+
+    $toolsFolderPath = Split-Path -Parent $PSScriptRoot
+    $repoRoot = Split-Path -Parent $toolsFolderPath
+    $buildHelperFolderPath = Join-Path -Path $toolsFolderPath -ChildPath 'buildHelper'
+    $buildHelperModulePath = Join-Path -Path $buildHelperFolderPath -ChildPath 'buildHelper.psm1'
+    Import-Module $buildHelperModulePath
+    $buildScriptPath = Join-Path -Path $repoRoot -ChildPath "build.ps1"
+    if (!($Version -eq ""))
+    {
+      Write-Verbose -Verbose "using $Channel version: $Version"
+      if ($Channel -eq "stable")
+      {
+        & $buildScriptPath -UpdateBuildYaml -Channel $Channel -StableVersion $Version -Verbose -Acr All -OsFilter All
+      }
+      elseif ($Channel -eq "preview")
+      {
+        & $buildScriptPath -UpdateBuildYaml -Channel $Channel -PreviewVersion $Version -Verbose -Acr All -OsFilter All
+      }
+      else #Channel lts
+      {
+        & $buildScriptPath -UpdateBuildYaml -Channel $Channel -LtsVersion $Version -Verbose -Acr All -OsFilter All
+      }
+    }
+    else
+    {
+      Write-Verbose -Verbose "using $Channel only"
+      & $buildScriptPath -UpdateBuildYaml -Channel $Channel -Verbose -Acr All -OsFilter All
+    }
+}
+
+
+# Update stableReleaseStage.yml
+Update-ChannelReleaseStageYaml -Channel stable -Version $stableVersion
+
+# Update previewReleaseStage.yml
+Update-ChannelReleaseStageYaml -Channel preview -Version $previewVersion
+
+# Update ltsReleaseStage.yml
+Update-ChannelReleaseStageYaml -Channel lts -Version $ltsVersion
+
diff --git a/tools/updateYamls/updateYamls.md b/tools/updateYamls/updateYamls.md
new file mode 100644
index 000000000..83cb3409e
--- /dev/null
+++ b/tools/updateYamls/updateYamls.md
@@ -0,0 +1,15 @@
+# Update Build Yamls
+
+## Context
+
+This `updateBuildYamls.ps1` script needs to be run before the build pipeline for PowerShell-Docker is kicked off. Running the script will produce a channel based yaml file, like &lt;channel&gt;ReleaseStage.yml for each channel. Then a PR must be created with these newly added/updated yaml files as the build will rely on them.
+
+## Running the Script
+
+To update the releaseStage.yml file for all the channels, run `./updateBuildYamls.ps1 -StableVersion <stableVersion> -PreviewVersion <previewVersion> -LtsVersion <ltsVersion>`.
+
+If you want the channel versions from channels.json to be used, simply omit the -*Version parameters and run, `./updateBuildYamls.ps1`.
+
+## Notes
+
+The versions provided must match versioning syntax rules for stable and preview versions. Valid examples include 7.4.2 (stable) and v7.4.0-preview.5 (preview)

From 58ef02640844fc939c48565532acc951cd76df67 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 24 Apr 2024 17:24:55 -0400
Subject: [PATCH 320/354] exclude channel based ReleaseStage.yml files from ci
 (#805)

---
 vsts-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vsts-ci.yml b/vsts-ci.yml
index 53d1d167d..0d0ca6585 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -12,6 +12,9 @@ pr:
     exclude:
     - .github/*
     - .vsts-ci/releasebuild.yml
+    - .vsts-ci/ltsReleaseStage.yml
+    - .vsts-ci/previewReleaseStage.yml
+    - .vsts-ci/stableReleaseStage.yml
     - assets/matrix.json
     - README.md
 

From 50fca1570bc561df125e1c30e985484fec1e7519 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 24 Apr 2024 18:14:18 -0400
Subject: [PATCH 321/354] update build yamls for stable 7.4.2, preview
 7.5.0-preview.2 and lts 7.2.19 (#804)

---
 .vsts-ci/ltsReleaseStage.yml     | 212 +++++++++++++++++++++++++++
 .vsts-ci/previewReleaseStage.yml | 242 +++++++++++++++++++++++++++++++
 .vsts-ci/stableReleaseStage.yml  | 242 +++++++++++++++++++++++++++++++
 3 files changed, 696 insertions(+)
 create mode 100644 .vsts-ci/ltsReleaseStage.yml
 create mode 100644 .vsts-ci/previewReleaseStage.yml
 create mode 100644 .vsts-ci/stableReleaseStage.yml

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
new file mode 100644
index 000000000..d911820c9
--- /dev/null
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -0,0 +1,212 @@
+parameters:
+- name: channel
+  default: 'preview'
+- name: channelPath
+  default: ''
+- name: vmImage
+  default: PSMMSUbuntu20.04-Secure
+stages:
+- stage: StageGenerateBuild_lts
+  dependsOn: ['StageResolveVersionandYaml']
+  displayName: Build lts
+  jobs:
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316
+      artifactSuffix: alpine316
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317
+      artifactSuffix: alpine317
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11
+      artifactSuffix: debian11
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2
+      artifactSuffix: mariner2
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8
+      artifactSuffix: ubi8
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04
+      artifactSuffix: ubuntu20.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04
+      artifactSuffix: ubuntu22.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu20.04-arm32v7
+      artifactSuffix: ubuntu20.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu22.04-arm32v7
+      artifactSuffix: ubuntu22.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: nanoserver1809
+      artifactSuffix: nanoserver1809
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: nanoserver2022
+      artifactSuffix: nanoserver2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsserver2022
+      artifactSuffix: windowsserver2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsservercore2022
+      artifactSuffix: windowsservercore2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316\test-deps
+      artifactSuffix: alpine316_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317\test-deps
+      artifactSuffix: alpine317_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11\test-deps
+      artifactSuffix: debian11_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2\test-deps
+      artifactSuffix: mariner2_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8\test-deps
+      artifactSuffix: ubi8_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04\test-deps
+      artifactSuffix: ubuntu20.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04\test-deps
+      artifactSuffix: ubuntu22.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
new file mode 100644
index 000000000..631177296
--- /dev/null
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -0,0 +1,242 @@
+parameters:
+- name: channel
+  default: 'preview'
+- name: channelPath
+  default: ''
+- name: vmImage
+  default: PSMMSUbuntu20.04-Secure
+stages:
+- stage: StageGenerateBuild_preview
+  dependsOn: ['StageResolveVersionandYaml']
+  displayName: Build preview
+  jobs:
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316
+      artifactSuffix: alpine316
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317
+      artifactSuffix: alpine317
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11
+      artifactSuffix: debian11
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian12
+      artifactSuffix: debian12
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2
+      artifactSuffix: mariner2
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8
+      artifactSuffix: ubi8
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi9
+      artifactSuffix: ubi9
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04
+      artifactSuffix: ubuntu20.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04
+      artifactSuffix: ubuntu22.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu20.04-arm32v7
+      artifactSuffix: ubuntu20.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu22.04-arm32v7
+      artifactSuffix: ubuntu22.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm64'
+      imageName: mariner2-arm64
+      artifactSuffix: mariner2_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsserver2022
+      artifactSuffix: windowsserver2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsservercore2022
+      artifactSuffix: windowsservercore2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316\test-deps
+      artifactSuffix: alpine316_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317\test-deps
+      artifactSuffix: alpine317_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11\test-deps
+      artifactSuffix: debian11_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian12\test-deps
+      artifactSuffix: debian12_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2\test-deps
+      artifactSuffix: mariner2_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8\test-deps
+      artifactSuffix: ubi8_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi9\test-deps
+      artifactSuffix: ubi9_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04\test-deps
+      artifactSuffix: ubuntu20.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04\test-deps
+      artifactSuffix: ubuntu22.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
new file mode 100644
index 000000000..d16a86ff2
--- /dev/null
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -0,0 +1,242 @@
+parameters:
+- name: channel
+  default: 'preview'
+- name: channelPath
+  default: ''
+- name: vmImage
+  default: PSMMSUbuntu20.04-Secure
+stages:
+- stage: StageGenerateBuild_stable
+  dependsOn: ['StageResolveVersionandYaml']
+  displayName: Build stable
+  jobs:
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316
+      artifactSuffix: alpine316
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317
+      artifactSuffix: alpine317
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11
+      artifactSuffix: debian11
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian12
+      artifactSuffix: debian12
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2
+      artifactSuffix: mariner2
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8
+      artifactSuffix: ubi8
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi9
+      artifactSuffix: ubi9
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04
+      artifactSuffix: ubuntu20.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04
+      artifactSuffix: ubuntu22.04
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu20.04-arm32v7
+      artifactSuffix: ubuntu20.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm32'
+      imageName: ubuntu22.04-arm32v7
+      artifactSuffix: ubuntu22.04_arm32v7
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_arm64'
+      imageName: mariner2-arm64
+      artifactSuffix: mariner2_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsserver2022
+      artifactSuffix: windowsserver2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_windows_amd64'
+      imageName: windowsservercore2022
+      artifactSuffix: windowsservercore2022
+      poolOS: 'windows'
+      poolHostArchitecture: 'amd64'
+      maxParallel: 3
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine316\test-deps
+      artifactSuffix: alpine316_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine317\test-deps
+      artifactSuffix: alpine317_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian11\test-deps
+      artifactSuffix: debian11_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian12\test-deps
+      artifactSuffix: debian12_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: mariner2\test-deps
+      artifactSuffix: mariner2_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi8\test-deps
+      artifactSuffix: ubi8_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubi9\test-deps
+      artifactSuffix: ubi9_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu20.04\test-deps
+      artifactSuffix: ubuntu20.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releasePhase.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu22.04\test-deps
+      artifactSuffix: ubuntu22.04_test_deps
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}

From 2a940c6fbd9490bf7775b6b154c4e2e1ed27b285 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 24 Apr 2024 18:53:59 -0400
Subject: [PATCH 322/354] artifactSuffix is used to create jobName in build and
 thus cant have period in it (#806)

---
 .vsts-ci/ltsReleaseStage.yml       | 12 ++++++------
 .vsts-ci/previewReleaseStage.yml   | 12 ++++++------
 .vsts-ci/stableReleaseStage.yml    | 12 ++++++------
 tools/buildHelper/buildHelper.psm1 |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index d911820c9..41c10e618 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -64,7 +64,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
-      artifactSuffix: ubuntu20.04
+      artifactSuffix: ubuntu2004
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -74,7 +74,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
-      artifactSuffix: ubuntu22.04
+      artifactSuffix: ubuntu2204
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -84,7 +84,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
-      artifactSuffix: ubuntu20.04_arm32v7
+      artifactSuffix: ubuntu2004_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
-      artifactSuffix: ubuntu22.04_arm32v7
+      artifactSuffix: ubuntu2204_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -194,7 +194,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu20.04_test_deps
+      artifactSuffix: ubuntu2004_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -204,7 +204,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu22.04_test_deps
+      artifactSuffix: ubuntu2204_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index 631177296..39c96e06b 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -84,7 +84,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
-      artifactSuffix: ubuntu20.04
+      artifactSuffix: ubuntu2004
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
-      artifactSuffix: ubuntu22.04
+      artifactSuffix: ubuntu2204
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -104,7 +104,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
-      artifactSuffix: ubuntu20.04_arm32v7
+      artifactSuffix: ubuntu2004_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -114,7 +114,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
-      artifactSuffix: ubuntu22.04_arm32v7
+      artifactSuffix: ubuntu2204_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -224,7 +224,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu20.04_test_deps
+      artifactSuffix: ubuntu2004_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -234,7 +234,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu22.04_test_deps
+      artifactSuffix: ubuntu2204_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index d16a86ff2..7bc0619a6 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -84,7 +84,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
-      artifactSuffix: ubuntu20.04
+      artifactSuffix: ubuntu2004
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
-      artifactSuffix: ubuntu22.04
+      artifactSuffix: ubuntu2204
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -104,7 +104,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
-      artifactSuffix: ubuntu20.04_arm32v7
+      artifactSuffix: ubuntu2004_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -114,7 +114,7 @@ stages:
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
-      artifactSuffix: ubuntu22.04_arm32v7
+      artifactSuffix: ubuntu2204_arm32v7
       poolOS: 'linux'
       poolHostArchitecture: 'arm64'
       buildKitValue: 1
@@ -224,7 +224,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu20.04_test_deps
+      artifactSuffix: ubuntu2004_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -234,7 +234,7 @@ stages:
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu22.04_test_deps
+      artifactSuffix: ubuntu2204_test_deps
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 85bc26d1b..92577635b 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1080,7 +1080,7 @@ function Get-TemplatePopulatedYaml {
     $sixSpace = " "*6
 
     $imageName = $ImageInfo.Name
-    $artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_")
+    $artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_").Replace(".","")
     $architecture = $ImageInfo.Architecture
     $poolOS = $ImageInfo.IsLinux ? "linux" : "windows"
     $archBasedJobName = "Build_$($poolOS)_$($architecture)"

From b480a95ea9c638d7077c87d3bad94deba2ee145d Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 25 Apr 2024 18:00:26 -0400
Subject: [PATCH 323/354] delete mariner2 test-deps, update buildHelper func to
 populate poolHostVersion, and update channel based ReleaseStage.yml files
 (#807)

---
 .vsts-ci/ltsReleaseStage.yml                  | 20 ++++-------
 .vsts-ci/previewReleaseStage.yml              | 16 +++------
 .vsts-ci/stableReleaseStage.yml               | 16 +++------
 release/7-2/mariner2/meta.json                |  1 -
 .../7-2/mariner2/test-deps/docker/Dockerfile  | 34 ------------------
 release/7-2/mariner2/test-deps/meta.json      | 17 ---------
 release/7-3/mariner2/meta.json                |  1 -
 .../7-3/mariner2/test-deps/docker/Dockerfile  | 35 -------------------
 release/7-3/mariner2/test-deps/meta.json      | 17 ---------
 release/7-4/mariner2/meta.json                |  1 -
 .../7-4/mariner2/test-deps/docker/Dockerfile  | 35 -------------------
 release/7-4/mariner2/test-deps/meta.json      | 17 ---------
 release/7-5/mariner2/meta.json                |  1 -
 .../7-5/mariner2/test-deps/docker/Dockerfile  | 35 -------------------
 release/7-5/mariner2/test-deps/meta.json      | 17 ---------
 tools/buildHelper/buildHelper.psm1            |  5 +--
 16 files changed, 17 insertions(+), 251 deletions(-)
 delete mode 100644 release/7-2/mariner2/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/mariner2/test-deps/meta.json
 delete mode 100644 release/7-3/mariner2/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/mariner2/test-deps/meta.json
 delete mode 100644 release/7-4/mariner2/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/mariner2/test-deps/meta.json
 delete mode 100644 release/7-5/mariner2/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/mariner2/test-deps/meta.json

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index 41c10e618..eaea6c56e 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -106,7 +106,6 @@ stages:
       imageName: nanoserver1809
       artifactSuffix: nanoserver1809
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -116,7 +115,8 @@ stages:
       imageName: nanoserver2022
       artifactSuffix: nanoserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -126,7 +126,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -136,7 +137,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -170,16 +172,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index 39c96e06b..e3669c09e 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -136,7 +136,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index 7bc0619a6..c3e2e8791 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -136,7 +136,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'
diff --git a/release/7-2/mariner2/meta.json b/release/7-2/mariner2/meta.json
index 58d299216..e88ee86f4 100644
--- a/release/7-2/mariner2/meta.json
+++ b/release/7-2/mariner2/meta.json
@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 387
     },
diff --git a/release/7-2/mariner2/test-deps/docker/Dockerfile b/release/7-2/mariner2/test-deps/docker/Dockerfile
deleted file mode 100644
index b099b7844..000000000
--- a/release/7-2/mariner2/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    # install dependencies
-    tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    mariner-repos-microsoft-preview \
-    net-tools \
-    tar \
-    util-linux \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/mariner2/test-deps/meta.json b/release/7-2/mariner2/test-deps/meta.json
deleted file mode 100644
index 222c298b0..000000000
--- a/release/7-2/mariner2/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 760
-    }
-}
diff --git a/release/7-3/mariner2/meta.json b/release/7-3/mariner2/meta.json
index 83cce1b2d..8a9cb9b32 100644
--- a/release/7-3/mariner2/meta.json
+++ b/release/7-3/mariner2/meta.json
@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 332
     },
diff --git a/release/7-3/mariner2/test-deps/docker/Dockerfile b/release/7-3/mariner2/test-deps/docker/Dockerfile
deleted file mode 100644
index 8cdf20681..000000000
--- a/release/7-3/mariner2/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y \
-    # install dependencies
-    && tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    mariner-repos-microsoft-preview \
-    net-tools \
-    tar \
-    util-linux \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/mariner2/test-deps/meta.json b/release/7-3/mariner2/test-deps/meta.json
deleted file mode 100644
index 222c298b0..000000000
--- a/release/7-3/mariner2/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 760
-    }
-}
diff --git a/release/7-4/mariner2/meta.json b/release/7-4/mariner2/meta.json
index a8c48a05c..de4bd4be1 100644
--- a/release/7-4/mariner2/meta.json
+++ b/release/7-4/mariner2/meta.json
@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 335
     },
diff --git a/release/7-4/mariner2/test-deps/docker/Dockerfile b/release/7-4/mariner2/test-deps/docker/Dockerfile
deleted file mode 100644
index 396f62ec6..000000000
--- a/release/7-4/mariner2/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y --exclude=powershell-preview \
-    # install dependencies
-    && tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    mariner-repos-microsoft-preview \
-    net-tools \
-    tar \
-    util-linux \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/mariner2/test-deps/meta.json b/release/7-4/mariner2/test-deps/meta.json
deleted file mode 100644
index 222c298b0..000000000
--- a/release/7-4/mariner2/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 760
-    }
-}
diff --git a/release/7-5/mariner2/meta.json b/release/7-5/mariner2/meta.json
index a8c48a05c..de4bd4be1 100644
--- a/release/7-5/mariner2/meta.json
+++ b/release/7-5/mariner2/meta.json
@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 335
     },
diff --git a/release/7-5/mariner2/test-deps/docker/Dockerfile b/release/7-5/mariner2/test-deps/docker/Dockerfile
deleted file mode 100644
index 396f62ec6..000000000
--- a/release/7-5/mariner2/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Mariner image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:mariner
-FROM ${BaseImage}
-
-# To find which package provides a particular command, run:
-# tdnf install dnf-utils
-# dnf provides <command>
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/cache/tdnf \
-    tdnf update -y --exclude=powershell-preview \
-    # install dependencies
-    && tdnf install -y \
-    dnf-utils \
-    sudo \
-    curl \
-    wget \
-    # provides ping and trace path
-    iputils \
-    # provides ps
-    procps-ng \
-    unzip \
-    git \
-    mariner-repos-microsoft-preview \
-    net-tools \
-    tar \
-    util-linux \
-    # clean cached data
-    && tdnf clean all
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/mariner2/test-deps/meta.json b/release/7-5/mariner2/test-deps/meta.json
deleted file mode 100644
index 222c298b0..000000000
--- a/release/7-5/mariner2/test-deps/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Mariner 2.0",
-    "tagTemplates": [
-        "mariner-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-redhat"
-    ],
-    "TestProperties": {
-        "size": 760
-    }
-}
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 92577635b..784cdc63b 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1096,15 +1096,16 @@ function Get-TemplatePopulatedYaml {
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)imageName: $imageName" # ie. imageName: alpine317\test-deps (since this differs from artifactSuffix for test-deps images only, we have a separate entry as the yaml param)
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)artifactSuffix: $artifactSuffix" # i.e artifactSuffix: alpine317_test_deps 
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolOS: '$poolOS'"
-    Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
     if ($poolOS -eq "linux")
     {
+        # only need to specify host architecture for the pool for linux
+        Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
         # only need to specify buildKitValue=1 for linux
         Add-Content -Path $YamlFilePath -Value "$($sixSpace)buildKitValue: 1"
     }
     else
     {
-        if ($imageName -contains "2022")
+        if ($imageName.Contains("2022"))
         {
             Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
             Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"

From 813a18038f82cfc6fe30f93f13f320ecc7b46a03 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 1 May 2024 13:24:19 -0400
Subject: [PATCH 324/354] for all windows jobs specify 2022 pooled job as it is
 backwards compatible (#808)

---
 .vsts-ci/ltsReleaseStage.yml       | 2 ++
 tools/buildHelper/buildHelper.psm1 | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index eaea6c56e..3df614edf 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -106,6 +106,8 @@ stages:
       imageName: nanoserver1809
       artifactSuffix: nanoserver1809
       poolOS: 'windows'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 784cdc63b..52be74893 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1105,12 +1105,8 @@ function Get-TemplatePopulatedYaml {
     }
     else
     {
-        if ($imageName.Contains("2022"))
-        {
-            Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
-            Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"
-        }
-
+        Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
+        Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"
         Add-Content -Path $YamlFilePath -Value "$($sixSpace)maxParallel: 3"
     }
 

From c2f97e21e3edc9129880d02445351ed97b1ec497 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 1 May 2024 21:11:52 -0400
Subject: [PATCH 325/354] update BuildHelper to rename the releasePhase.yml
 file to releaseJob.yml (#809)

---
 .vsts-ci/ltsReleaseStage.yml       | 38 +++++++++++++-------------
 .vsts-ci/previewReleaseStage.yml   | 44 +++++++++++++++---------------
 .vsts-ci/stableReleaseStage.yml    | 44 +++++++++++++++---------------
 tools/buildHelper/buildHelper.psm1 |  2 +-
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index 3df614edf..ce016c5bb 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -10,7 +10,7 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build lts
   jobs:
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316
@@ -20,7 +20,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317
@@ -30,7 +30,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11
@@ -40,7 +40,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: mariner2
@@ -50,7 +50,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8
@@ -60,7 +60,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
@@ -70,7 +70,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
@@ -80,7 +80,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
@@ -90,7 +90,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
@@ -100,7 +100,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: nanoserver1809
@@ -111,7 +111,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: nanoserver2022
@@ -122,7 +122,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsserver2022
@@ -133,7 +133,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsservercore2022
@@ -144,7 +144,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316\test-deps
@@ -154,7 +154,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317\test-deps
@@ -164,7 +164,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11\test-deps
@@ -174,7 +174,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8\test-deps
@@ -184,7 +184,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
@@ -194,7 +194,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index e3669c09e..af86ea8a7 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -10,7 +10,7 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build preview
   jobs:
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316
@@ -20,7 +20,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317
@@ -30,7 +30,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11
@@ -40,7 +40,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian12
@@ -50,7 +50,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: mariner2
@@ -60,7 +60,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8
@@ -70,7 +70,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi9
@@ -80,7 +80,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
@@ -90,7 +90,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
@@ -100,7 +100,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
@@ -110,7 +110,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
@@ -120,7 +120,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm64'
       imageName: mariner2-arm64
@@ -130,7 +130,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsserver2022
@@ -141,7 +141,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsservercore2022
@@ -152,7 +152,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316\test-deps
@@ -162,7 +162,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317\test-deps
@@ -172,7 +172,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11\test-deps
@@ -182,7 +182,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian12\test-deps
@@ -192,7 +192,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8\test-deps
@@ -202,7 +202,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi9\test-deps
@@ -212,7 +212,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
@@ -222,7 +222,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index c3e2e8791..8f270e127 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -10,7 +10,7 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build stable
   jobs:
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316
@@ -20,7 +20,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317
@@ -30,7 +30,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11
@@ -40,7 +40,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian12
@@ -50,7 +50,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: mariner2
@@ -60,7 +60,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8
@@ -70,7 +70,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi9
@@ -80,7 +80,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04
@@ -90,7 +90,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04
@@ -100,7 +100,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu20.04-arm32v7
@@ -110,7 +110,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
       imageName: ubuntu22.04-arm32v7
@@ -120,7 +120,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm64'
       imageName: mariner2-arm64
@@ -130,7 +130,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsserver2022
@@ -141,7 +141,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_windows_amd64'
       imageName: windowsservercore2022
@@ -152,7 +152,7 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine316\test-deps
@@ -162,7 +162,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: alpine317\test-deps
@@ -172,7 +172,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian11\test-deps
@@ -182,7 +182,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: debian12\test-deps
@@ -192,7 +192,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi8\test-deps
@@ -202,7 +202,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubi9\test-deps
@@ -212,7 +212,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu20.04\test-deps
@@ -222,7 +222,7 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
+  - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
       imageName: ubuntu22.04\test-deps
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 52be74893..1b4cb0adb 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -1090,7 +1090,7 @@ function Get-TemplatePopulatedYaml {
         $architecture = "arm64" # we need to use hostArchicture arm64 for pool for arm32
     }
 
-    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)- template: /.vsts-ci/releasePhase.yml@self"
+    Add-Content -Path $YamlFilePath -Value "$($doubleSpace)- template: /.vsts-ci/releaseJob.yml@self"
     Add-Content -Path $YamlFilePath -Value "$($fourSpace)parameters:"
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)archName: '$archBasedJobName'" # ie: Build_Linux_arm32
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)imageName: $imageName" # ie. imageName: alpine317\test-deps (since this differs from artifactSuffix for test-deps images only, we have a separate entry as the yaml param)

From db9597dface903f34b4e2843f50fdde1e947ba43 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 2 May 2024 12:44:32 -0400
Subject: [PATCH 326/354] Migrate Build pipeline to OneBranch (#810)

* Generated Yaml Pipeline

* Generated Yaml Pipeline

* rename yml file to what OneBranch set up expects

* revert renaming so it matches GH master naming

* delete unneeded files and rename mariner2_arm64 to mariner2-arm64 to master GH naming

* use update stableReleaseStage.yml that doesnt include mariner2 test-deps image and includes hostVersion value for windowsserver*2022

* fix reference to channelPath variable

* use dependencies syntax

* in releaseStage.yml refer to prior stage output variable

* revert dependency reference to channelPath variable, and add template call for preview and lts releaseStage

* comment out preview and lts releaseStage template calls for now

* add back preview release stage template call

* attempt to move most inline pwsh script into buildHelper module

* set var with empty string differently

* actually set var with empty string differently

* use correct step name

* call templates for each channel

* remove variable and potentially unneeded Az install step

* reduce ipmo lines from 2 to 1

* Revert "reduce ipmo lines from 2 to 1"

This reverts commit c9c4c8966b023e2b40e8076fe9d82c30ec23e33b.

* Revert "remove variable and potentially unneeded Az install step"

This reverts commit ab84d6edd8919fb58870ca5a09b6ab7f390e7da6.

* Revert "call templates for each channel"

This reverts commit 5fc222fe3685d82f7a101fc939d8de3ee2b6f144.

* Revert "use correct step name"

This reverts commit ff8bf91eb666a737c5211a4dee80a13f0a85fabc.

* Revert "actually set var with empty string differently"

This reverts commit 4a6c532dde62ff42a46039a4735d5f96b0fd1790.

* Revert "set var with empty string differently"

This reverts commit a6e7db73a4176384846a1a62b076e60cca18d7f6.

* Revert "attempt to move most inline pwsh script into buildHelper module"

This reverts commit 3196f1b4432bbda6e75d149664782fb9853af314.

* rename releasePhase.yml to releaseJob.yml

* conditionally call the channel based template

* fix parameter names and clean up setVersionStepsTemplate.yml

* fix typo

* capture env

* define variables

* debug why dockernamespace is null

* debug why releaseTag is null

* Revert "debug why releaseTag is null"

This reverts commit a655e6cc6d6d2f5eaeb266f49de23747d5b0235c.

* Revert "debug why dockernamespace is null"

This reverts commit 97df6ca2dc13f1e3c9d84efeffccf4fea49525f4.

* Revert "define variables"

This reverts commit 3da77502b56cf777a9f0d85e9d8efc52c2b15dd0.

* Revert "capture env"

This reverts commit 33756f8392768d9abab030a8b52e5a7f041aa7d4.

* Revert "fix typo"

This reverts commit 9db45acdb29c7c9ad1e76373d966e6e13be6193b.

* Revert "fix parameter names and clean up setVersionStepsTemplate.yml"

This reverts commit e924c5e259ebca94e6a47ebf82cb628062ddba9b.

* Revert "conditionally call the channel based template"

This reverts commit e0b6422ac46d670d33e1db30779fef25bb0c19a7.

* try conditionally calling stableReleaseStage.yml template

* see if conditionally setting all channel template calls will bypass size issue

* fix typo

* rename releasePhase.yml to releaseJob.yml in preview and lts ymls

* change param to be for generic version and accept channel param

* Fix variable name referred to in setVersionStepsTemplate.yml

* add conditional template call for preview and lts

* specify hostVersion param for other windows amd64 image

* Remove changes to GenerateMatrixJson that were not needed

* remove newline added

* remove comments

* remove releaseStage.yml which is not used anymore

* Update .pipelines/PowerShell-Docker-Image-Build-Official.yml

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>

* Update .vsts-ci/manifestSteps.yml

* Update .vsts-ci/templatesGeneric/setVersionStepsTemplate.yml

---------

Co-authored-by: EasyStart-Prod <>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .config/tsaoptions.json                       |   9 +
 ...PowerShell-Docker-Image-Build-Official.yml | 138 ++++++++++++
 .vsts-ci/manifestSteps.yml                    |  65 +++---
 .vsts-ci/releaseJob.yml                       | 178 +++++++++++++++
 .vsts-ci/releasePhase.yml                     | 203 ------------------
 .vsts-ci/releaseStage.yml                     |  68 ------
 .vsts-ci/releasebuild.yml                     | 203 ------------------
 .../setVersionStepsTemplate.yml               |  41 ++--
 build.ps1                                     |  31 +++
 tools/buildHelper/buildHelper.psm1            | 131 +++++++++++
 10 files changed, 526 insertions(+), 541 deletions(-)
 create mode 100644 .config/tsaoptions.json
 create mode 100644 .pipelines/PowerShell-Docker-Image-Build-Official.yml
 create mode 100644 .vsts-ci/releaseJob.yml
 delete mode 100644 .vsts-ci/releasePhase.yml
 delete mode 100644 .vsts-ci/releaseStage.yml
 delete mode 100644 .vsts-ci/releasebuild.yml

diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
new file mode 100644
index 000000000..192449d5f
--- /dev/null
+++ b/.config/tsaoptions.json
@@ -0,0 +1,9 @@
+{
+    "instanceUrl": "https://msazure.visualstudio.com",
+    "projectName": "One",
+    "areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core",
+    "notificationAliases": [
+        "annavied@microsoft.com",
+        "tplunk@microsoft.com"
+    ]
+}
diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
new file mode 100644
index 000000000..c10b354ce
--- /dev/null
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -0,0 +1,138 @@
+name: PSDocker-Build-$(Build.BuildId)-version_$(releaseVersionTag)_channel_$(releaseChannel)$(Rev:_rr)
+trigger: none
+parameters:
+- name: 'releaseVersionTag'
+  default: 'v7.4.0-preview.5'
+- name: 'releaseChannel'
+  default: 'preview'
+variables:
+- name: POWERSHELL_TELEMETRY_OPTOUT
+  value: 1
+- name: DOCKER_RELEASE
+  value: true
+- name: releaseVersionTag
+  value: ${{ parameters.releaseVersionTag }}
+- name: releaseChannel
+  value: ${{ parameters.releaseChannel }}
+- name: releaseChannelPath
+  value: ''
+- name: runCodesignValidationInjection
+  value: false
+- name: DisableDockerDetector
+  value: true
+- name: LinuxContainerImage
+  value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
+- name: WindowsContainerImage
+  value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
+- name: ob_sdl_sbom_enabled
+  value: true
+- name: ob_signing_setup_enabled
+  value: true
+#CodeQL tasks added manually to workaround signing failures
+- name: ob_sdl_codeql_compiled_enabled
+  value: false
+resources:
+  repositories:
+  - repository: onebranchTemplates
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    featureFlags:
+      runHostSDL: true
+    customTags: 'ES365AIMigrationTooling-BulkMigrated'
+    stages:
+    - stage: StageResolveVersionandYaml
+      displayName: Resolve Versions and Populate Channel Based Yamls
+      jobs:
+      - job: JobResolveVersions
+        displayName: Resolve Versions
+        condition: succeededOrFailed()
+        variables:
+        - name: ob_outputDirectory
+          value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+        - name: repoRoot
+          value: $(Build.SourcesDirectory)
+        - name: ob_sdl_tsa_configFile
+          value: $(Build.SourcesDirectory)\.config\tsaoptions.json
+        - name: signSrcPath
+          value: $(repoRoot)/out
+        - name: ob_sdl_sbom_enabled
+          value: false
+        - name: ob_signing_setup_enabled
+          value: true
+        #CodeQL tasks added manually to workaround signing failures
+        - name: ob_sdl_codeql_compiled_enabled
+          value: false
+        pool:
+          timeoutInMinutes: 30
+          type: windows
+        steps:
+        - pwsh: |
+            if (($env:RELEASECHANNEL -eq "stable") -or ($env:RELEASECHANNEL -eq "lts"))
+            {
+              if ($env:RELEASEVERSIONTAG -notmatch '^v\d+\.\d+\.\d+$') {
+                throw "${$env:RELEASECHANNEL} release tag is not for a ${$env:RELEASECHANNEL} build: '${$env:RELEASEVERSIONTAG}'"
+              }
+            }
+            elseif ($env:RELEASECHANNEL -eq "preview")
+            {
+              if ($env:RELEASEVERSIONTAG -notmatch '^v\d+\.\d+\.\d+-(preview|rc)\.\d+$') {
+                throw "${$env:RELEASECHANNEL} release tag is not for a ${$env:RELEASECHANNEL} build: '${$env:RELEASEVERSIONTAG}'"
+              }
+            }
+            else
+            {
+              throw "channel ${$env:RELEASECHANNEL} is not a supported channel"
+            }
+          displayName: stop build if release tag does not match release tag format for channel
+        - pwsh: |
+            $toolsFolderPath = Join-Path -Path $(repoRoot) -ChildPath 'tools'
+            $buildHelperFolderPath = Join-Path -Path $toolsFolderPath -ChildPath 'buildHelper'
+            $buildHelperModulePath = Join-Path -Path $buildHelperFolderPath -ChildPath 'buildHelper.psm1'
+            Import-Module $buildHelperModulePath
+            $channelsInfo = Get-ChannelData
+            if ($channelsInfo)
+            {
+              foreach ($channelEntry in $channelsInfo)
+              {
+                Write-Verbose -Verbose "channel path is: $($channelEntry.Path)"
+                if ($($channelEntry.Name) -eq "stable")
+                {
+                  $stablePath = "$($channelEntry.Path)"
+                  Write-Host "##vso[task.setvariable variable=stableChannelPath;isOutput=true]$stablePath"
+                }
+                elseif ($($channelEntry.Name) -eq "preview")
+                {
+                  $previewPath = $($channelEntry.Path)
+                  Write-Host "##vso[task.setvariable variable=previewChannelPath;isOutput=true]$previewPath"
+                }
+                elseif ($($channelEntry.Name) -eq "lts")
+                {
+                  $ltsPath = $($channelEntry.Path)
+                  Write-Host "##vso[task.setvariable variable=ltsChannelPath;isOutput=true]$ltsPath"
+                }
+              }
+            }
+          displayName: 'Get Channel path info'
+          name: setChannelPathInfo
+        - pwsh: |
+            Get-ChildItem env: | Out-String -Width 1000
+          displayName: 'Capture Environment'
+    - ${{ if eq(parameters.releaseChannel, 'stable') }}:
+      - template: /.vsts-ci/stableReleaseStage.yml@self
+        parameters:
+          channel: ${{ parameters.releaseChannel }}
+          channelPath: 'release/7-4'
+    - ${{ if eq(parameters.releaseChannel, 'preview') }}:
+      - template: /.vsts-ci/previewReleaseStage.yml@self
+        parameters:
+          channel: ${{ parameters.releaseChannel }}
+          channelPath: 'release/7-5'
+    - ${{ if eq(parameters.releaseChannel, 'lts') }}:
+      - template: /.vsts-ci/ltsReleaseStage.yml@self
+        parameters:
+          channel: ${{ parameters.releaseChannel }}
+          channelPath: 'release/7-2'
diff --git a/.vsts-ci/manifestSteps.yml b/.vsts-ci/manifestSteps.yml
index 0b971a5bc..a61f16e00 100644
--- a/.vsts-ci/manifestSteps.yml
+++ b/.vsts-ci/manifestSteps.yml
@@ -1,39 +1,26 @@
-steps:
-- powershell: |
-    $namespace = '$(releaseTag)'.ToLowerInvariant()
-    Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
-  displayName: 'Set dockerNamespace'
-
-- powershell: 'Get-ChildItem env:'
-  displayName: 'Capture Environment'
-
-- pwsh: |
-    $PSVersionTable
-  displayName: Capture pwsh Version
-
-- powershell: |
-      $dockerConfigFolder = "$env:userprofile/.docker"
-      if(!(Test-Path $dockerConfigFolder)){ $null = new-item -Type Directory -Path $dockerConfigFolder}
-      $dockerCliConfig = "$env:userprofile/.docker/config.json"
-      $dockerCliBackup = "$env:userprofile/.docker/config-backup.json"
-      if(Test-Path $dockerCliConfig) { copy-item $dockerCliConfig $dockerCliBackup -force}
-      @{experimental='enabled'}|ConvertTo-Json | Out-File -Encoding ascii -FilePath $dockerCliConfig
-
-  displayName: 'enable docker cli experimental features'
-
-- powershell: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
-  displayName: 'docker login'
-
-- pwsh: |
-        ./createAllManifests.ps1 -Registry '$(dockerHost)/public/$(dockerNamespace)' -Channel $(Channel)
-  displayName: 'Create $(Channel) Manifest Lists'
-
-- powershell: 'docker logout $(dockerHost)'
-  displayName: 'docker logout'
-  condition: always()
-
-- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-  displayName: 'Component Detection'
-  inputs:
-    sourceScanPath: '$(Build.SourcesDirectory)'
-    snapshotForceEnabled: true
+steps:
+- pwsh: |
+    $namespace = '$(releaseTag)'.ToLowerInvariant()
+    Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
+  displayName: 'Set dockerNamespace'
+- pwsh: 'Get-ChildItem env:'
+  displayName: 'Capture Environment'
+- pwsh: |
+    $PSVersionTable
+  displayName: Capture pwsh Version
+- pwsh: |
+    $dockerConfigFolder = "$env:userprofile/.docker"
+    if(!(Test-Path $dockerConfigFolder)){ $null = new-item -Type Directory -Path $dockerConfigFolder}
+    $dockerCliConfig = "$env:userprofile/.docker/config.json"
+    $dockerCliBackup = "$env:userprofile/.docker/config-backup.json"
+    if(Test-Path $dockerCliConfig) { copy-item $dockerCliConfig $dockerCliBackup -force}
+    @{experimental='enabled'}|ConvertTo-Json | Out-File -Encoding ascii -FilePath $dockerCliConfig
+  displayName: 'enable docker cli experimental features'
+- pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)'
+  displayName: 'docker login'
+- pwsh: |
+    ./createAllManifests.ps1 -Registry '$(dockerHost)/public/$(dockerNamespace)' -Channel $(Channel)
+  displayName: 'Create $(Channel) Manifest Lists'
+- pwsh: 'docker logout $(dockerHost)'
+  displayName: 'docker logout'
+  condition: always()
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
new file mode 100644
index 000000000..d796c6454
--- /dev/null
+++ b/.vsts-ci/releaseJob.yml
@@ -0,0 +1,178 @@
+parameters:
+- name: archName
+  default: ''
+- name: imageName
+  default: 'none'
+- name: artifactSuffix
+  default: ''
+- name: ACR
+  default: 'No'
+- name: maxParallel
+  default: 5
+- name: poolOS
+  default: windows
+- name: poolHostArchitecture
+  default: ''
+- name: poolHostVersion
+  default: ''
+- name: channelPath
+  default: ''
+- name: buildKitValue
+  default: 0
+- name: channel
+  default: 'preview'
+- name: releaseTag
+  default: ''
+- name: windowsContainerImageValue
+  default: ''
+jobs:
+- job: Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
+  variables:
+  - name: dockerImage
+    value: 'powershell'
+  - name: releaseTag
+    value: ${{ parameters.releaseTag }}
+  - name: scanType
+    value: Register
+  - group: 'Azure Blob variable group'
+  - group: Build Docker Group
+  - group: Staging_ACR
+  - name: repoRoot
+    value: $(Build.SourcesDirectory)
+  - name: ob_outputDirectory
+    value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+  - name: ob_git_checkout
+    value: true
+  pool:
+    type: linux
+  timeoutInMinutes: 135
+  displayName: 'Prep data to be used for docker build of ${{ parameters.artifactSuffix }}'
+  steps:
+  - task: UseDotNet@2
+    inputs:
+      packageType: 'sdk'
+      version: 7.x
+  - pwsh: |
+      dotnet --list-sdks
+    displayName: dotnet info
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=acrName;isOutput=true]$env:ACR_NAME_VAR"
+    displayName: 'Set ACR name variable'
+    name: setACRVariableStep
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=channel;]${{ parameters.channel }}"
+    displayName: 'Set channel variable'
+  - template: /.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml@self
+  - pwsh: |
+      $finalImageName = '${{ parameters.imageName }}'
+      $finalContextFolder = 'docker'
+      $testDepsString = 'test-deps'
+      if ($finalImageName.Contains($testDepsString))
+      {
+        $finalImageName = $finalImageName.TrimEnd("\$testDepsString")
+        $finalContextFolder = Join-Path -Path $testDepsString -ChildPath $finalContextFolder
+      }
+      $pathToContextFolder = "${{ parameters.channelPath }}/$finalImageName/$finalContextFolder"
+      Write-Host "##vso[task.setvariable variable=dockerBuildImageName;isOutput=true]$finalImageName"
+      Write-Host "##vso[task.setvariable variable=dockerBuildContextFolder;isOutput=true]$finalContextFolder"
+    displayName: Get Proper ImageName and ContextFolder
+    name: setImageNameStep
+  - pwsh: |
+      $modules = 'Az.Accounts', 'Az.Storage'
+      foreach ($module in $modules) {
+        if (!(Get-Module $module -listavailable)) {
+          Write-Host "installing $module..." -verbose
+          Install-Module $module -force -allowclobber
+        } else {
+          Write-Host "$module is already installed" -verbose
+        }
+      }
+    displayName: 'Install AzAccounts'
+  - task: AzurePowerShell@5
+    inputs:
+      azureSubscription: az-blob-cicd-infra
+      scriptType: inlineScript
+      azurePowerShellVersion: latestVersion
+      pwsh: true
+      inline: |
+        $containerName = Out-String -InputObject $(DOCKERNAMESPACE) -NoNewline
+        $containerName = $containerName.Replace('.', '-')
+        $context = New-AzStorageContext -StorageAccountName $(StorageAccount)
+        $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
+        $uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net")
+        $uriBuilder.Query = $querystring.ToString()
+        $url = $uriBuilder.ToString()
+        Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
+    displayName: 'Set SasUrl variable'
+  - pwsh: |
+      Get-ChildItem env: | Out-String -Width 1000
+    displayName: 'Capture Environment'
+  - pwsh: |
+      if($env:SASURL)
+      {
+        Write-Host 'Using SasUrl...'
+        $buildArgsString = ./build.ps1 -SasUrl $env:SASURL -ImageName $(dockerHost) -name '$(setImageNameStep.dockerBuildImageName)' -Channel ${{ parameters.channel }} -TestLogPostfix '${{ parameters.imageName }}-${{ parameters.channel }}' -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
+        Write-Host "##vso[task.setvariable variable=sasBuildArgs;isOutput=true]$buildArgsString"
+      }
+    displayName: 'Set build args from SAS token'
+    name: setSASVariableStep
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: $(repoRoot)/${{ parameters.channelPath }}/$(setImageNameStep.dockerBuildImageName)/$(setImageNameStep.dockerBuildContextFolder)
+      TargetFolder: $(ob_outputDirectory)/$(setImageNameStep.dockerBuildImageName)
+    displayName: "Copy Dockerfile to ob_outputDirectory/ONEBRANCH_ARTIFACT - '$(ob_outputDirectory)'"
+- job: Job_Build_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
+  dependsOn:
+    - Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
+  variables:
+  - name: ob_outputDirectory # this directory is uploaded to pipeline artifacts
+    value: '$(Build.SourcesDirectory)/dst'
+  - name: ob_git_checkout
+    value: true
+  - name: OB_build_container
+    value: true # Set this variable to enable Mixed Mode
+  - ${{ if ne(parameters.windowsContainerImageValue, '')}}:
+    - name: WindowsContainerImage
+      value: ${{ parameters.windowsContainerImageValue }}
+  - name: dockerBuildImageName
+    value: $[ dependencies.Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}.outputs['setImageNameStep.dockerBuildImageName'] ]
+  - name: ACRName
+    value: $[ dependencies.Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}.outputs['setACRVariableStep.acrName'] ]
+  - name: SasBuildArgs
+    value: $[ dependencies.Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}.outputs['setSASVariableStep.sasBuildArgs'] ]
+  - name: HostVersionValue
+    value: $[ dependencies.Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}.outputs['setImageNameStep.hostVersion'] ]
+  pool:
+    type: docker
+    os: ${{ parameters.poolOS }}
+    ${{ if ne(parameters.poolHostArchitecture, '') }}:
+      hostArchitecture: ${{ parameters.poolHostArchitecture }}
+    ${{ if ne(parameters.poolHostVersion, '') }}:
+      hostVersion: ${{ parameters.poolHostVersion }}
+  steps:
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      targetPath: $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
+      artifact: drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
+    displayName: 'Download artifact to which Dockerfile was uploaded'
+  - task: onebranch.pipeline.containercontrol@1
+    displayName: "Login to source ACR"
+    inputs:
+      command: login
+      acr_name: $(ACRName)
+      tenant: MSFT
+  - task: onebranch.pipeline.imagebuildinfo@1
+    displayName: image build
+    inputs:
+      dockerFileRelPath: $(dockerBuildImageName)/$(dockerBuildImageName)/Dockerfile
+      build_tag: $(Build.BuildNumber)
+      repositoryName: $(dockerBuildImageName)
+      saveImageToPath: $(dockerBuildImageName).tar
+      arguments: $(SasBuildArgs)
+      registry: $(ACRName)
+      buildkit: ${{ parameters.buildKitValue }}
+      enable_network: true
+      enable_cache: true
+      enable_pull: true
+
+
diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml
deleted file mode 100644
index 9e6afd5b8..000000000
--- a/.vsts-ci/releasePhase.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-parameters:
-  - name: vmImage
-    default: PSMMSUbuntu20.04-Secure
-  - name: jobName
-    default: 'none'
-  - name: releaseTag
-    default: ''
-  - name: ACR
-    default: 'No'
-  - name: maxParallel
-    default: 5
-  - name: dependsOn
-    default: []
-    type: object
-  - name: matrix
-  - name: pool
-    default: PowerShell1ES
-  - name: imageVersion
-    default: 'latest'
-
-jobs:
-- job: ${{ parameters.jobName }}
-  dependsOn:
-    ${{ parameters.dependsOn }}
-  strategy:
-      matrix: $[ ${{ parameters.matrix }} ]
-      maxParallel: ${{ parameters.maxParallel }}
-  variables:
-  - name: dockerImage
-    value: 'powershell'
-  - name: ACR
-    value: ${{ parameters.ACR }}
-  - name: releaseTag
-    value: ${{ parameters.releaseTag }}
-  - name: scanType
-    value: Register
-  - group: Azure Blob Variable Group
-
-  pool:
-    name: ${{ parameters.pool }}
-    demands:
-      - ImageOverride -equals ${{ parameters.vmImage }}
-      - ${{ if ne(parameters.imageVersion, 'latest') }}:
-        - ImageVersionOverride -equals ${{ parameters.imageVersion }}
-
-
-  timeoutInMinutes: 135
-
-  displayName: ${{ parameters.jobName }}
-
-  steps:
-  - task: UseDotNet@2
-    inputs:
-      packageType: 'sdk'
-      version: 7.x
-
-  - pwsh: |
-      dotnet --list-sdks
-    displayName: dotnet info
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      if (!(get-Command -name 'az' -errorAction SilentlyContinue)) {
-        Write-Host "Installing Az CLI"
-        curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-      }
-    displayName: Install Azure CLI
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Build Artifacts'
-    inputs:
-      downloadType: specific
-      itemPattern: buildMeta/**/*.json
-
-  - powershell: |
-      $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
-      if($json.Count -ge 1)
-      {
-        $jsonText = Get-Content -Path $json.FullName
-        $fullTag = ($jsonText | ConvertFrom-Json).FullTag
-        Write-Verbose "setting FULL_TAG to $fullTag" -verbose
-        Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
-      }
-      else{
-        Write-Verbose "Did not find buildmeta json" -verbose
-      }
-    displayName: Set FULL_TAG variable
-
-  - pwsh: |
-      Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
-    displayName: 'Enable ACR'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - template: ./templatesGeneric/setVersionStepsTemplate.yml
-
-  - pwsh: |
-      Get-ChildItem env: | Out-String -Width 1000
-    displayName: 'Capture Environment'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      docker login $(dockerHost) -u $(dockerUserName) -p $(dockerKey)
-    displayName: 'docker login $(dockerHost)'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      if($env:ACR -eq 'yes')
-      {
-        Write-Host 'Using ACR, will need to az login'
-        az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)
-      }
-    displayName: 'az login'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      $modules = 'Az.Accounts', 'Az.Storage'
-      foreach ($module in $modules) {
-        if (!(Get-Module $module -listavailable)) {
-          Write-Host "installing $module..." -verbose
-          Install-Module $module -force -allowclobber
-        } else {
-          Write-Host "$module is already installed" -verbose
-        }
-      }
-    displayName: 'Install AzAccounts'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - task: AzurePowerShell@5
-    inputs:
-      azureSubscription: '$(AzureFileCopySubscription)'
-      scriptType: inlineScript
-      azurePowerShellVersion: latestVersion
-      pwsh: true
-      inline: |
-        $containerName = Out-String -InputObject $(DOCKERNAMESPACE) -NoNewline
-        $containerName = $containerName.Replace('.', '-')
-        $context = New-AzStorageContext -StorageAccountName $(StorageAccount)
-        $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
-        $uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net")
-        $uriBuilder.Query = $querystring.ToString()
-        $url = $uriBuilder.ToString()
-        Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
-    displayName: 'Set SasUrl variable'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
-    displayName: 'Install Pester'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      $extraParams = @{}
-      if($env:ACR -eq 'no')
-      {
-        Write-Host 'Not in ACR, will push...'
-        $extraParams.Add('Push',$true)
-      }
-      else
-      {
-        az account set --subscription $(AcrSubscriptionName)
-        Write-Host 'Using ACR, will NOT test behavior...'
-        $extraParams.Add('SkipTest',$true)
-      }
-
-      if($env:SASURL)
-      {
-        Write-Host 'Using SasUrl...'
-        $extraParams.Add('SasUrl',$env:SASURL)
-      }
-
-      ./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
-    displayName: 'Build All $(Channel)'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - task: ComponentGovernanceComponentDetection@0
-    inputs:
-      dockerImagesToScan: $(dockerImagesToScan)
-      scanType: $(scanType)
-      verbosity: 'Verbose'
-      alertWarningLevel: 'High'
-      failOnAlert: true
-    displayName: Component Governance - $(ImageName) $(Channel)
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''), eq(variables['pool'],'PowerShell1ES'), ne(variables['ACR'],'No'))
-
-  - pwsh: 'docker logout $(dockerHost)'
-    displayName: 'docker logout'
-    condition: and( always(), ne(variables['Channel'],''))
-
-  - pwsh: |
-      if($env:ACR -eq 'yes')
-      {
-        Write-Host 'Using ACR, will need to az logout'
-        az logout
-      }
-    displayName: 'az logout'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true
diff --git a/.vsts-ci/releaseStage.yml b/.vsts-ci/releaseStage.yml
deleted file mode 100644
index 3304e0323..000000000
--- a/.vsts-ci/releaseStage.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-parameters:
-  - name: channel
-    default: 'preview'
-  - name: vmImage
-    default: PSMMSUbuntu20.04-Secure
-  - name: acr
-    default: 'All'
-  - name: useacr
-    default: 'false'
-  - name: osFilter
-    default: 'All'
-
-stages:
-  - stage: GenerateYaml_${{ parameters.channel }}
-    dependsOn: ['GenerateFullTag']
-    displayName: Build ${{ parameters.channel }}
-    jobs:
-    - job: GenerateYaml_${{ parameters.channel }}
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals ${{ parameters.vmImage }}
-
-      displayName: Generate Matrix YAML ${{ parameters.channel }}
-      steps:
-      - pwsh: |
-          ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter ${{ parameters.osFilter }}
-        displayName: Generate Matrix YAML
-        condition: succeededOrFailed()
-        name: matrix
-      - pwsh: |
-          dir env:matrix_* | out-string -Width 1000
-        displayName: Capture Matrix YAML
-        condition: succeededOrFailed()
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
-        dependsOn:
-          - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux_x64
-
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
-        dependsOn:
-          - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux_arm64
-        pool: PS-mscodehub-ARM
-        vmImage: PSMMSUbuntu20.04-ARM64-secure
-
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
-        dependsOn:
-          - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Linux_arm32
-        pool: PS-mscodehub-ARM
-        vmImage: PSMMSUbuntu20.04-ARM64-secure
-        
-    - template: releasePhase.yml
-      parameters:
-        matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
-        dependsOn:
-          - GenerateYaml_${{ parameters.channel }}
-        jobName: Build_Win_x64
-        vmImage: PSMMS2019-Secure
-        ACR: yes
-        maxParallel: 3
diff --git a/.vsts-ci/releasebuild.yml b/.vsts-ci/releasebuild.yml
deleted file mode 100644
index d24fe808c..000000000
--- a/.vsts-ci/releasebuild.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)
-
-parameters:
-  - name: 'previewReleaseTag'
-    default: 'v7.5.0-preview.2'
-  - name: 'ltsReleaseTag'
-    default: 'v7.2.19'
-  - name: 'stableReleaseTag'
-    default: 'v7.4.1'
-
-resources:
-- repo: self
-  clean: true
-
-variables:
-  POWERSHELL_TELEMETRY_OPTOUT: 1
-  DOCKER_RELEASE: true
-  previewReleaseTag: ${{ parameters.previewReleaseTag }}
-  ltsReleaseTag: ${{ parameters.ltsReleaseTag }}
-  stableReleaseTag: ${{ parameters.stableReleaseTag }}
-  runCodesignValidationInjection: false
-  DisableDockerDetector: true
-
-stages:
-  - stage: GenerateFullTag
-    displayName: Generate Full Tag
-    jobs:
-    - job: GenerateFullTag
-
-      displayName: Generate Full Tag
-
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals PSMMSUbuntu20.04-Secure
-        timeoutInMinutes: 30
-
-      steps:
-      - pwsh: |
-          if ($env:PREVIEWRELEASETAG -notmatch '^v\d+\.\d+\.\d+-(preview|rc)\.\d+$') {
-            throw "preview release tag is not for a preview build: '${env:PREVIEWRELEASETAG}'"
-          }
-        displayName: stop build if preview release tag does not match preview format
-      - pwsh: |
-          if ($env:STABLERELEASETAG -notmatch '^v\d+\.\d+\.\d+$') {
-            throw "stable release tag is not for a stable build: '${env:STABLERELEASETAG}'"
-          }
-        displayName: stop build if stable release tag does not match stable format
-      - pwsh: |
-          if ($env:LTSRELEASETAG -notmatch '^v\d+\.\d+\.\d+$') {
-            throw "LTS release tag is not for a stable build: '${env:LTSRELEASETAG}'"
-          }
-        displayName: stop build if LTS release tag does not match stable format
-      - pwsh: |
-          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/BuildMeta.json'
-          @{
-            FullTag = (Get-Date).ToString("yyyyMMdd")
-          } | ConvertTo-Json | Out-File -Encoding utf8NoBOM -FilePath ./BuildMeta.json
-          Write-Host "##vso[artifact.upload containerfolder=buildMeta;artifactname=buildMeta]$path"
-        displayName: Create BuildMeta Json with FullTag
-  - template: releaseStage.yml
-    parameters:
-      channel: stable
-  - template: releaseStage.yml
-    parameters:
-      channel: preview
-  - template: releaseStage.yml
-    parameters:
-      channel: lts
-
-  - stage: GenerateManifests
-    dependsOn:
-      - GenerateYaml_stable
-      - GenerateYaml_preview
-      - GenerateYaml_lts
-    jobs:
-    - job: PreviewManifestPhase
-      variables:
-        releaseTag: $(previewReleaseTag)
-        channel: PREVIEW
-
-      displayName: Create Preview Manifest Lists
-      condition: succeededOrFailed()
-
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals PSMMS2019-Secure
-
-      timeoutInMinutes: 30
-
-      steps:
-      - template: manifestSteps.yml
-
-    - job: LtsManifestPhase
-      variables:
-        releaseTag: $(ltsReleaseTag)
-        channel: LTS
-
-      displayName: Create Lts Manifest Lists
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals PSMMS2019-Secure
-
-      timeoutInMinutes: 30
-
-      steps:
-      - template: manifestSteps.yml
-
-    - job: StableManifestPhase
-      variables:
-        releaseTag: $(stableReleaseTag)
-        channel: STABLE
-
-      displayName: Create Stable Manifest Lists
-
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals PSMMS2019-Secure
-
-      timeoutInMinutes: 30
-
-      steps:
-      - template: manifestSteps.yml
-
-  - stage: GenerateTagsYaml
-    dependsOn: ['GenerateFullTag']
-    jobs:
-    - job: GenerateTagsYaml
-
-      displayName: Generate Tags YAML
-
-      condition: succeededOrFailed()
-      pool:
-        name: PowerShell1ES
-        demands:
-          - ImageOverride -equals PSMMSUbuntu20.04-Secure
-
-      timeoutInMinutes: 30
-
-      steps:
-      - task: DownloadBuildArtifacts@0
-        displayName: 'Download Build Artifacts'
-        inputs:
-          downloadType: specific
-          itemPattern: buildMeta/**/*.json
-      - powershell: |
-          $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
-          if($json.Count -ge 1)
-          {
-            $jsonText = Get-Content -Path $json.FullName
-            $fullTag = ($jsonText | ConvertFrom-Json).FullTag
-            Write-Verbose "setting FULL_TAG to $fullTag" -verbose
-            Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
-          }
-          else{
-            Write-Verbose "Did not find buildmeta json" -verbose
-          }
-        displayName: Set FULL_TAG variable
-
-      - powershell: |
-          $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
-          Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
-          $previewVersion = '$(previewReleaseTag)' -replace '^v', ''
-          Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
-          $ltsVersion = '$(ltsReleaseTag)' -replace '^v', ''
-          Write-Host "##vso[task.setvariable variable=LtsVersion;]$ltsVersion"
-        displayName: 'Set Versions'
-
-      - powershell: 'Get-ChildItem env:'
-        displayName: 'Capture Environment'
-
-      - powershell: Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
-        displayName: 'Install Pester'
-
-      - powershell: |
-            $yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview, lts -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion)
-            $yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
-            Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
-                    Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
-                }
-        displayName: Generate Tags YAML
-
-      - powershell: |
-          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
-          @{
-            'previewReleaseTag' = '$(previewReleaseTag)'
-            'stableReleaseTag' = '$(stableReleaseTag)'
-            'ltsReleaseTag' = '$(ltsReleaseTag)'
-          }|convertto-json | out-file -FilePath $path -Encoding ascii
-          Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
-        displayName: Save release Tags
-
-      - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-        displayName: 'Component Detection'
-        inputs:
-          sourceScanPath: '$(Build.SourcesDirectory)'
-          snapshotForceEnabled: true
diff --git a/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml b/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml
index c918b137d..75488562a 100644
--- a/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml
+++ b/.vsts-ci/templatesGeneric/setVersionStepsTemplate.yml
@@ -1,28 +1,13 @@
-steps:
-  - pwsh: |
-      switch('$(Channel)') {
-        'stable' {
-          $releaseTag = '$(stableReleaseTag)'
-          $version = '$(stableReleaseTag)' -replace '^v', ''
-        }
-        'preview' {
-          $releaseTag = '$(previewReleaseTag)'
-          $version = '$(previewReleaseTag)' -replace '^v', ''
-        }
-        'lts' {
-          $releaseTag = '$(ltsReleaseTag)'
-          $version = '$(ltsReleaseTag)' -replace '^v', ''
-        }
-        default {
-          throw "Unknown channel '$(Channel)'"
-        }
-      }
-      $namespace = $releaseTag.ToLowerInvariant()
-      Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
-      $version = $releaseTag -replace '^v', ''
-      $command = "vso[task.setvariable variable=version]$version"
-      Write-Host $command
-      Write-Host "##$command"
-    displayName: 'Set Version'
-    name: get
-    condition: and( succeededOrFailed(), ne(variables['Channel'],''))
+steps:
+- pwsh: |
+    $releaseTag = '$(releaseVersionTag)'
+    $version = '$(releaseVersionTag)' -replace '^v', ''
+    $namespace = $releaseTag.ToLowerInvariant()
+    Write-Host "##vso[task.setvariable variable=dockerNamespace;]$namespace"
+    $version = $releaseTag -replace '^v', ''
+    $command = "vso[task.setvariable variable=version]$version"
+    Write-Host $command
+    Write-Host "##$command"
+  displayName: 'Set Version'
+  name: get
+  condition: and( succeededOrFailed(), ne(variables['Channel'],''))
diff --git a/build.ps1 b/build.ps1
index 7f44828e3..514d8d65c 100755
--- a/build.ps1
+++ b/build.ps1
@@ -27,6 +27,7 @@ param(
     [Parameter(ParameterSetName="localBuildAll")]
     [Parameter(ParameterSetName="TestByName")]
     [Parameter(ParameterSetName="TestAll")]
+    [Parameter(ParameterSetName="GetSASData")]
     [switch]
     $Pull,
 
@@ -57,11 +58,13 @@ param(
 
     [Parameter(ParameterSetName="localBuildByName")]
     [Parameter(ParameterSetName="localBuildAll")]
+    [Parameter(ParameterSetName="GetSASData")]
     [switch]
     $Push,
 
     [Parameter(ParameterSetName="localBuildByName")]
     [Parameter(ParameterSetName="localBuildAll")]
+    [Parameter(ParameterSetName="GetSASData")]
     [switch]
     $SkipTest,
 
@@ -97,6 +100,7 @@ param(
 
     [Parameter(ParameterSetName="localBuildByName")]
     [Parameter(ParameterSetName="localBuildAll")]
+    [Parameter(Mandatory, ParameterSetName="GetSASData")]
     [ValidateScript({([uri]$_).Scheme -eq 'https'})]
     [string]
     $SasUrl,
@@ -107,6 +111,7 @@ param(
     [Parameter(Mandatory, ParameterSetName="TestAll")]
     [Parameter(Mandatory, ParameterSetName="GetTagsByName")]
     [Parameter(Mandatory, ParameterSetName="GetTagsByChannel")]
+    [Parameter(ParameterSetName="GetSASData")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
     [string]
     $Version,
@@ -188,6 +193,7 @@ DynamicParam {
     Add-ParameterAttribute -ParameterSetName 'localBuildByName' -Attributes $Attributes
     Add-ParameterAttribute -ParameterSetName 'GetTagsByName' -Attributes $Attributes
     Add-ParameterAttribute -ParameterSetName 'GenerateTagsYaml' -Attributes $Attributes -Mandatory $false
+    Add-ParameterAttribute -ParameterSetName 'GetSASData' -Attributes $Attributes
 
     if($dockerFileNames.Count -gt 0)
     {
@@ -208,6 +214,7 @@ DynamicParam {
     Add-ParameterAttribute -ParameterSetName 'TestAll' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'TestByName' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'localBuildAll' -Attributes $channelAttributes
+    Add-ParameterAttribute -ParameterSetName 'GetSASData' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'localBuildByName' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GetTagsByName' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GetTagsByChannel' -Attributes $channelAttributes
@@ -248,6 +255,8 @@ Begin {
         $Channels = $channelNames
     } elseif ($FullJson) {
         $Channels = $channelNames | Where-Object { $_ -notlike 'community*' }
+    } elseif ( $PSCmdlet.ParameterSetName -eq 'GetSASData' ) {
+        $Channels = $Channel
     } else {
         $Channels = $Channel
     }
@@ -375,6 +384,28 @@ End {
             $useAcr = $allMeta.meta.UseAcr
             $continueOnError = $allMeta.meta.ContinueOnError
 
+            if ($SasUrl)
+            {
+                $params = @{
+                    Dockerfile    = $dockerFileName
+                    psversion     = $allMeta.psversion
+                    SasData       = $sasData
+                    actualChannel = $actualChannel
+                    actualTagData = $actualTagData
+                    actualVersion = $windowsVersion
+                    AllMeta       = $allMeta
+                    CI            = $CI.IsPresent
+                }
+
+                if($allMeta.BaseImage)
+                {
+                    $params.Add('BaseImage',$allMeta.BaseImage)
+                }
+
+                $testParams = Get-SASBuildArgs @params
+                return $testParams
+            }
+
             if ($Build.IsPresent -or $Test.IsPresent)
             {
                 $params = @{
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 1b4cb0adb..6776dd308 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -809,6 +809,137 @@ function Get-TestParams
     }
 }
 
+function Get-SASBuildArgs
+{
+    param(
+        [string]
+        $dockerFileName,
+        [string]
+        $psversion,
+        [SasData]
+        $SasData,
+        [string]
+        $actualChannel,
+        [TagData]
+        $actualTagData,
+        [string]
+        $actualVersion,
+        [DockerImageFullMetaData]
+        $allMeta,
+        [switch]
+        $CI,
+        [string]
+        $BaseImage
+    )
+
+    Write-Verbose -Message "To be tested, repository: $($allMeta.FullRepository) fromTag: $($actualTagData.FromTag) Tag: $($actualTagData.ActualTag) PSversion: $psversion" -Verbose
+    # $contextPath = Join-Path -Path $allMeta.imagePath -ChildPath 'docker'
+    $script:ErrorActionPreference = 'stop'
+    # Import-Module (Join-Path -Path $testsPath -ChildPath 'containerTestCommon.psm1') -Force
+    if ($allMeta.meta.IsLinux) {
+        $os = 'linux'
+    }
+    else {
+        $os = 'windows'
+    }
+
+    $skipVerification = $false
+    if($dockerFileName -eq 'nanoserver' -and $CI.IsPresent)
+    {
+        Write-Verbose -Message "Skipping verification of $($actualTagData.ActualTags[0]) in CI because the CI system only supports LTSC and at least 1709 is required." -Verbose
+        # The version of nanoserver in CI doesn't have all the changes needed to verify the image
+        $skipVerification = $true
+    }
+
+    # for the image name label, always use the official image name
+    Write-Verbose -Verbose "made it here"
+    $imageNameParam = "mcr.microsoft.com/$($allMeta.FullRepository):" + $actualTagData.TagList[0]
+    Write-Verbose -Verbose "past first indexing"
+    if($actualChannel -like 'community-*')
+    {
+        # use the image name for pshorg for community images
+        $imageNameParam = 'pshorg/powershellcommunity:' + $actualTagData.TagList[0]
+    }
+
+    $packageVersion = $psversion
+
+    # if the package name ends with rpm
+    # then replace the - in the filename with _ as fpm creates the packages this way.
+    if($allMeta.meta.PackageFormat -and $allMeta.meta.PackageFormat -match 'rpm$')
+    {
+        $packageVersion = $packageVersion -replace '-', '_'
+    }
+
+    $buildArgs = [System.Collections.Generic.Dictionary[string,string]]::new()
+    $buildArgs['fromTag'] = $actualTagData.FromTag
+    $buildArgs['PS_VERSION'] = $psversion
+    $buildArgs['PACKAGE_VERSION'] = $packageVersion
+    $buildArgs['IMAGE_NAME'] = $imageNameParam
+    $buildArgs['BaseImage'] = $BaseImage
+    $buildArgs['PS_INSTALL_VERSION'] = Get-PwshInstallVersion -Channel $actualChannel
+
+    if ($allMeta.meta.PackageFormat)
+    {
+        if($sasData.sasUrl)
+        {
+            $packageUrl = [System.UriBuilder]::new($sasData.sasBase)
+
+            $channelTag = Get-ChannelPackageTag -Channel $actualChannel
+
+            $packageName = $allMeta.meta.PackageFormat -replace '\${PS_VERSION}', $packageVersion
+            $packageName = $packageName -replace '\${channelTag}', $channelTag
+            $containerName = 'v' + ($psversion -replace '\.', '-') -replace '~', '-'
+            $packageUrl.Path = $packageUrl.Path + $containerName + '/' + $packageName
+            $packageUrl.Query = $sasData.sasQuery
+            if($allMeta.meta.Base64EncodePackageUrl)
+            {
+                $urlBytes = [System.Text.Encoding]::Unicode.GetBytes($packageUrl.ToString())
+                $encodedUrl =[Convert]::ToBase64String($urlBytes)
+                $buildArgs.Add('PS_PACKAGE_URL_BASE64', $encodedUrl)
+            }
+            else
+            {
+                $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.ToString())
+            }
+        }
+    }
+
+    $testArgs = @{
+        tags = $actualTagData.ActualTags
+        BuildArgs = $buildArgs
+        ContextPath = $contextPath
+        OS = $os
+        ExpectedVersion = $actualVersion
+        SkipVerification = $skipVerification
+        SkipWebCmdletTests = $allMeta.meta.SkipWebCmdletTests
+        SkipGssNtlmSspTests = $allMeta.meta.SkipGssNtlmSspTests
+        BaseImage = $BaseImage
+        OptionalTests = $allMeta.meta.OptionalTests
+        TestProperties = $allMeta.meta.TestProperties
+        Channel = $actualChannel
+        UseAcr = $allMeta.meta.UseAcr
+    }
+
+    $buildArgsString = ""
+    $buildArgsDict = $testArgs.BuildArgs
+
+    foreach($argKey in $buildArgsDict.Keys)
+    {
+        $value = $buildArgsDict[$argKey]
+        if($UseAcr.IsPresent -and $env:ACR_NAME -and $value -match '&')
+        {
+            throw "$argKey contains '&' and this is not allowed in ACR using the az cli"
+        }
+
+        if($value)
+        {
+            $buildArgsString += " --build-arg $argKey=$value"
+        }
+    }
+
+    return $buildArgsString
+}
+
 class TagData{
     [string[]] $TagList
     [string] $FromTag

From ff092483fe0797dcd8fd19a8184673b9b0a1414f Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 14 May 2024 18:36:33 -0400
Subject: [PATCH 327/354] Update OneBranch build to output artifact with
 buildInfo.json (#811)

---
 .pipelines/PowerShell-Docker-Image-Build-Official.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
index c10b354ce..290143f2a 100644
--- a/.pipelines/PowerShell-Docker-Image-Build-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -121,6 +121,17 @@ extends:
         - pwsh: |
             Get-ChildItem env: | Out-String -Width 1000
           displayName: 'Capture Environment'
+        - pwsh: |
+            $info = @{}
+            $info.Add("channel", $env:RELEASECHANNEL)
+            $info.Add("releaseVersionTag", $env:RELEASEVERSIONTAG)
+            $info | ConvertTo-Json | Out-File -Encoding utf8NoBOM -FilePath ./BuildInfo.json
+          displayName: 'Write build info to file'
+        - task: CopyFiles@2
+          inputs:
+            Contents: '*BuildInfo.json'
+            TargetFolder: $(ob_outputDirectory)
+          displayName: "Copy buildInfo.json file to ob_outputDirectory - '$(ob_outputDirectory)'"
     - ${{ if eq(parameters.releaseChannel, 'stable') }}:
       - template: /.vsts-ci/stableReleaseStage.yml@self
         parameters:

From cac3738ea1718adb64e00f128446444416510770 Mon Sep 17 00:00:00 2001
From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:37:52 -0700
Subject: [PATCH 328/354] Update Code of Conduct and Security Policy (#812)

Updates the readme, code of conduct and security policy per OSPO request.
---
 .github/CODE_OF_CONDUCT.md | 10 ++++++++++
 .github/SECURITY.md        | 41 ++++++++++++++++++++++++++++++++++++++
 README.md                  | 12 +++++------
 docs/SECURITY.md           |  2 +-
 4 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 .github/CODE_OF_CONDUCT.md
 create mode 100644 .github/SECURITY.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..686e5e7a0
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,10 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 000000000..f941d308b
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin) and [PowerShell](https://github.com/PowerShell).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/README.md b/README.md
index 3c51ae621..e5eaeb944 100644
--- a/README.md
+++ b/README.md
@@ -100,12 +100,10 @@ Governance policy for PowerShell project is described [here][].
 
 [here]: https://github.com/PowerShell/PowerShell/blob/master/docs/community/governance.md
 
-## [Code of Conduct][conduct-md]
+## Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
-For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
+Please see our [Code of Conduct](.github/CODE_OF_CONDUCT.md) before participating in this project.
 
-[conduct-code]: http://opensource.microsoft.com/codeofconduct/
-[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
-[conduct-email]: mailto:opencode@microsoft.com
-[conduct-md]: https://github.com/PowerShell/PowerShell/tree/master/./CODE_OF_CONDUCT.md
+## Security Policy
+
+For any security issues, please see our [Security Policy](.github/SECURITY.md).
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 22c0cac7a..bbd39edd0 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -15,4 +15,4 @@ These versions are currently being supported with security updates:
 
 If you have found a potential security issue in PowerShell Core
 or any Docker images present in this repository,
-please email details to secure@microsoft.com.
+please see our [Security Policy](../.github/SECURITY.md).

From d6de8c9a6303295a4dcb7bc2928092bd346c7fcd Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 20 Aug 2024 10:58:35 -0500
Subject: [PATCH 329/354] Fix broken MAR link in README (#813)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e5eaeb944..040c159e4 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ with their size being the sum of the base image (200 megabytes)
 plus the uncompressed package (120 megabytes),
 and about 120 megabytes of .NET Core and bootstrapping dependencies.
 
-[docker-release]: [https://mcr.microsoft.com/powershell](https://mcr.microsoft.com/en-us/product/powershell/about)
+[docker-release]: https://mcr.microsoft.com/product/powershell/about
 
 ## Community
 

From 7fa1abcfaccc9831e56bc79186c5541bc5fe3e51 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 27 Aug 2024 18:09:07 -0400
Subject: [PATCH 330/354] Remove Secret Scan stage from PR ci, as it's already
 enabled (#818)

* remove Secret Scan stage from PR ci, as it's already enabled

* change package arg to reflect package name change (alpine to musl)

* update meta.json also for alpine316 and alpine317
---
 release/7-2/alpine316/docker/Dockerfile |  2 +-
 release/7-2/alpine316/meta.json         |  2 +-
 release/7-2/alpine317/docker/Dockerfile |  2 +-
 release/7-2/alpine317/meta.json         |  2 +-
 vsts-ci.yml                             | 25 -------------------------
 5 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/release/7-2/alpine316/docker/Dockerfile b/release/7-2/alpine316/docker/Dockerfile
index f5c397801..cfac28f6c 100644
--- a/release/7-2/alpine316/docker/Dockerfile
+++ b/release/7-2/alpine316/docker/Dockerfile
@@ -7,7 +7,7 @@ FROM ${hostRegistry}/alpine:3.16 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
diff --git a/release/7-2/alpine316/meta.json b/release/7-2/alpine316/meta.json
index d1335ae9e..8216faee0 100644
--- a/release/7-2/alpine316/meta.json
+++ b/release/7-2/alpine316/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
     "osVersion": "Alpine 3.16",
     "shortDistroName": "alpine",
     "shortTags": [
diff --git a/release/7-2/alpine317/docker/Dockerfile b/release/7-2/alpine317/docker/Dockerfile
index 2be46d2b0..c6c3f950f 100644
--- a/release/7-2/alpine317/docker/Dockerfile
+++ b/release/7-2/alpine317/docker/Dockerfile
@@ -7,7 +7,7 @@ FROM ${hostRegistry}/alpine:3.17 AS installer-env
 
 # Define Args for the needed to add the package
 ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 ARG PS_INSTALL_VERSION=7-preview
 
diff --git a/release/7-2/alpine317/meta.json b/release/7-2/alpine317/meta.json
index 849f58ed9..dd83a9823 100644
--- a/release/7-2/alpine317/meta.json
+++ b/release/7-2/alpine317/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
     "osVersion": "Alpine 3.17",
     "shortDistroName": "alpine",
     "shortTags": [
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 0d0ca6585..189e50830 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -58,28 +58,3 @@ stages:
         displayName: Check for Duplicate Tags
         condition: succeededOrFailed()
 
-  - stage: Secret_Scan
-    displayName: Secret Scan
-    dependsOn: []
-    jobs:
-    - job: Secret_Scan
-      pool:
-        vmImage: windows-latest
-      displayName: Secret Scan
-
-      steps:
-      - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-        displayName: 'Scan for secrets'
-        inputs:
-          debugMode: false
-          toolMajorVersion: V2
-
-      - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-        displayName: 'Publish Secret Scan Logs to Build Artifacts'
-        continueOnError: true
-
-      - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
-        displayName: 'Check for Failures'
-        inputs:
-          CredScan: true
-          ToolLogsNotFoundAction: Error

From 1a3b48ccd473af22ead89600f9c3bb22f8837c1f Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 27 Aug 2024 18:36:51 -0400
Subject: [PATCH 331/354] EOL debian11 and alpine3.16 (#817)

---
 release/7-2/alpine316/docker/Dockerfile       | 92 ------------------
 release/7-2/alpine316/meta.json               | 18 ----
 .../7-2/alpine316/test-deps/docker/Dockerfile | 35 -------
 release/7-2/alpine316/test-deps/meta.json     | 16 ----
 release/7-2/debian11/docker/Dockerfile        | 95 ------------------
 release/7-2/debian11/meta.json                | 22 -----
 .../7-2/debian11/test-deps/docker/Dockerfile  | 24 -----
 release/7-2/debian11/test-deps/meta.json      | 16 ----
 release/7-3/alpine316/docker/Dockerfile       | 92 ------------------
 release/7-3/alpine316/meta.json               | 18 ----
 .../7-3/alpine316/test-deps/docker/Dockerfile | 35 -------
 release/7-3/alpine316/test-deps/meta.json     | 16 ----
 release/7-3/debian11/docker/Dockerfile        | 96 -------------------
 release/7-3/debian11/meta.json                | 19 ----
 .../7-3/debian11/test-deps/docker/Dockerfile  | 24 -----
 release/7-3/debian11/test-deps/meta.json      | 16 ----
 release/7-4/alpine316/docker/Dockerfile       | 92 ------------------
 release/7-4/alpine316/meta.json               | 18 ----
 .../7-4/alpine316/test-deps/docker/Dockerfile | 35 -------
 release/7-4/alpine316/test-deps/meta.json     | 16 ----
 release/7-4/debian11/docker/Dockerfile        | 96 -------------------
 release/7-4/debian11/meta.json                | 19 ----
 .../7-4/debian11/test-deps/docker/Dockerfile  | 24 -----
 release/7-4/debian11/test-deps/meta.json      | 16 ----
 release/7-5/alpine316/docker/Dockerfile       | 92 ------------------
 release/7-5/alpine316/meta.json               | 18 ----
 .../7-5/alpine316/test-deps/docker/Dockerfile | 35 -------
 release/7-5/alpine316/test-deps/meta.json     | 16 ----
 release/7-5/debian11/docker/Dockerfile        | 96 -------------------
 release/7-5/debian11/meta.json                | 19 ----
 .../7-5/debian11/test-deps/docker/Dockerfile  | 24 -----
 release/7-5/debian11/test-deps/meta.json      | 16 ----
 32 files changed, 1266 deletions(-)
 delete mode 100644 release/7-2/alpine316/docker/Dockerfile
 delete mode 100644 release/7-2/alpine316/meta.json
 delete mode 100644 release/7-2/alpine316/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/alpine316/test-deps/meta.json
 delete mode 100644 release/7-2/debian11/docker/Dockerfile
 delete mode 100644 release/7-2/debian11/meta.json
 delete mode 100644 release/7-2/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/7-2/debian11/test-deps/meta.json
 delete mode 100644 release/7-3/alpine316/docker/Dockerfile
 delete mode 100644 release/7-3/alpine316/meta.json
 delete mode 100644 release/7-3/alpine316/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/alpine316/test-deps/meta.json
 delete mode 100644 release/7-3/debian11/docker/Dockerfile
 delete mode 100644 release/7-3/debian11/meta.json
 delete mode 100644 release/7-3/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/7-3/debian11/test-deps/meta.json
 delete mode 100644 release/7-4/alpine316/docker/Dockerfile
 delete mode 100644 release/7-4/alpine316/meta.json
 delete mode 100644 release/7-4/alpine316/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/alpine316/test-deps/meta.json
 delete mode 100644 release/7-4/debian11/docker/Dockerfile
 delete mode 100644 release/7-4/debian11/meta.json
 delete mode 100644 release/7-4/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/debian11/test-deps/meta.json
 delete mode 100644 release/7-5/alpine316/docker/Dockerfile
 delete mode 100644 release/7-5/alpine316/meta.json
 delete mode 100644 release/7-5/alpine316/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/alpine316/test-deps/meta.json
 delete mode 100644 release/7-5/debian11/docker/Dockerfile
 delete mode 100644 release/7-5/debian11/meta.json
 delete mode 100644 release/7-5/debian11/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/debian11/test-deps/meta.json

diff --git a/release/7-2/alpine316/docker/Dockerfile b/release/7-2/alpine316/docker/Dockerfile
deleted file mode 100644
index cfac28f6c..000000000
--- a/release/7-2/alpine316/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine316/meta.json b/release/7-2/alpine316/meta.json
deleted file mode 100644
index 8216faee0..000000000
--- a/release/7-2/alpine316/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.16",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.16"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-2/alpine316/test-deps/docker/Dockerfile b/release/7-2/alpine316/test-deps/docker/Dockerfile
deleted file mode 100644
index c7585fba2..000000000
--- a/release/7-2/alpine316/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/alpine316/test-deps/meta.json b/release/7-2/alpine316/test-deps/meta.json
deleted file mode 100644
index a8daf5955..000000000
--- a/release/7-2/alpine316/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.16",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-2/debian11/docker/Dockerfile b/release/7-2/debian11/docker/Dockerfile
deleted file mode 100644
index 5000c9940..000000000
--- a/release/7-2/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-FROM debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
-
-ARG PS_VERSION=6.2.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust0 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian11/meta.json b/release/7-2/debian11/meta.json
deleted file mode 100644
index 82630dfb5..000000000
--- a/release/7-2/debian11/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "tagTemplates": [
-        "#psversion#-debian-#shorttag#",
-        "debian-#shorttag#"
-    ],
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 400
-    },
-    "EndOfLife": "2024-11-30",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-2/debian11/test-deps/docker/Dockerfile b/release/7-2/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index bac40e64c..000000000
--- a/release/7-2/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-2/debian11/test-deps/meta.json b/release/7-2/debian11/test-deps/meta.json
deleted file mode 100644
index 397669627..000000000
--- a/release/7-2/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 400
-    }
-}
diff --git a/release/7-3/alpine316/docker/Dockerfile b/release/7-3/alpine316/docker/Dockerfile
deleted file mode 100644
index f5c397801..000000000
--- a/release/7-3/alpine316/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine316/meta.json b/release/7-3/alpine316/meta.json
deleted file mode 100644
index d1335ae9e..000000000
--- a/release/7-3/alpine316/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-alpine-x64.tar.gz",
-    "osVersion": "Alpine 3.16",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.16"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-3/alpine316/test-deps/docker/Dockerfile b/release/7-3/alpine316/test-deps/docker/Dockerfile
deleted file mode 100644
index c7585fba2..000000000
--- a/release/7-3/alpine316/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/alpine316/test-deps/meta.json b/release/7-3/alpine316/test-deps/meta.json
deleted file mode 100644
index a8daf5955..000000000
--- a/release/7-3/alpine316/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.16",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-3/debian11/docker/Dockerfile b/release/7-3/debian11/docker/Dockerfile
deleted file mode 100644
index 2abfd69a0..000000000
--- a/release/7-3/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim
-
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian11/meta.json b/release/7-3/debian11/meta.json
deleted file mode 100644
index 004ca8c80..000000000
--- a/release/7-3/debian11/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 340
-    },
-    "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-3/debian11/test-deps/docker/Dockerfile b/release/7-3/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index a87eee790..000000000
--- a/release/7-3/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-3/debian11/test-deps/meta.json b/release/7-3/debian11/test-deps/meta.json
deleted file mode 100644
index a9999ce7b..000000000
--- a/release/7-3/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 402
-    }
-}
diff --git a/release/7-4/alpine316/docker/Dockerfile b/release/7-4/alpine316/docker/Dockerfile
deleted file mode 100644
index cfac28f6c..000000000
--- a/release/7-4/alpine316/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine316/meta.json b/release/7-4/alpine316/meta.json
deleted file mode 100644
index 8216faee0..000000000
--- a/release/7-4/alpine316/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.16",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.16"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-4/alpine316/test-deps/docker/Dockerfile b/release/7-4/alpine316/test-deps/docker/Dockerfile
deleted file mode 100644
index c7585fba2..000000000
--- a/release/7-4/alpine316/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine316/test-deps/meta.json b/release/7-4/alpine316/test-deps/meta.json
deleted file mode 100644
index a8daf5955..000000000
--- a/release/7-4/alpine316/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.16",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-4/debian11/docker/Dockerfile b/release/7-4/debian11/docker/Dockerfile
deleted file mode 100644
index 2abfd69a0..000000000
--- a/release/7-4/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim
-
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/debian11/meta.json b/release/7-4/debian11/meta.json
deleted file mode 100644
index 004ca8c80..000000000
--- a/release/7-4/debian11/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 340
-    },
-    "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-4/debian11/test-deps/docker/Dockerfile b/release/7-4/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index a87eee790..000000000
--- a/release/7-4/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/debian11/test-deps/meta.json b/release/7-4/debian11/test-deps/meta.json
deleted file mode 100644
index a9999ce7b..000000000
--- a/release/7-4/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 402
-    }
-}
diff --git a/release/7-5/alpine316/docker/Dockerfile b/release/7-5/alpine316/docker/Dockerfile
deleted file mode 100644
index cfac28f6c..000000000
--- a/release/7-5/alpine316/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.16
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.16
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine316/meta.json b/release/7-5/alpine316/meta.json
deleted file mode 100644
index 8216faee0..000000000
--- a/release/7-5/alpine316/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.16",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.16"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "UseInCi": false
-}
diff --git a/release/7-5/alpine316/test-deps/docker/Dockerfile b/release/7-5/alpine316/test-deps/docker/Dockerfile
deleted file mode 100644
index c7585fba2..000000000
--- a/release/7-5/alpine316/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.16
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.16
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine316/test-deps/meta.json b/release/7-5/alpine316/test-deps/meta.json
deleted file mode 100644
index a8daf5955..000000000
--- a/release/7-5/alpine316/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.16",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-5/debian11/docker/Dockerfile b/release/7-5/debian11/docker/Dockerfile
deleted file mode 100644
index 2abfd69a0..000000000
--- a/release/7-5/debian11/docker/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/debian:bullseye-slim
-
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
-
-# Install dependencies and clean up
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # less is required for help in powershell
-        less \
-    # requied to setup the locale
-        locales \
-    # required for SSL
-        ca-certificates \
-        gss-ntlmssp \
-        libicu67 \
-        libssl1.1 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        libstdc++6 \
-        zlib1g \
-    # PowerShell remoting over SSH dependencies
-        openssh-client \
-    && apt-get dist-upgrade -y \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    # enable en_US.UTF-8 locale
-    && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
-    # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    # intialize powershell module cache
-    # and disable telemetry
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh \
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-          \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/debian11/meta.json b/release/7-5/debian11/meta.json
deleted file mode 100644
index 004ca8c80..000000000
--- a/release/7-5/debian11/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
-    "osVersion": "Debian 11",
-    "SkipGssNtlmSspTests": false,
-    "ShortDistroName": "debian",
-    "shortTags": [
-        {"Tag": "bullseye-slim"},
-        {"Tag": "11"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 340
-    },
-    "EndOfLife": "2023-12-15",
-    "DistributionState": "Validated"
-}
-
diff --git a/release/7-5/debian11/test-deps/docker/Dockerfile b/release/7-5/debian11/test-deps/docker/Dockerfile
deleted file mode 100644
index a87eee790..000000000
--- a/release/7-5/debian11/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker image file that describes an Debian image with PowerShell and test dependencies
-ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN --mount=type=cache,target=/var/lib/apt/lists \
-    apt-get update \
-    && apt-get install --no-install-recommends -y \
-        sudo \
-        curl \
-        wget \
-        iputils-ping \
-        iputils-tracepath \
-        procps \
-        git \
-        unzip \
-    && apt-get clean
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-11
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/debian11/test-deps/meta.json b/release/7-5/debian11/test-deps/meta.json
deleted file mode 100644
index a9999ce7b..000000000
--- a/release/7-5/debian11/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Debian 11 (Testing)",
-    "tagTemplates": [
-        "debian-#shorttag#"
-    ],
-    "SubRepository": "test-deps",
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-debian"
-    ],
-    "TestProperties": {
-        "size": 402
-    }
-}

From 44b2248bf9eb90cd441ae31286cac267a2a89e4c Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 28 Aug 2024 14:06:09 -0400
Subject: [PATCH 332/354] Remove test-deps images from build for now (#816)

* Remove test-deps images from build for now

* update yamls with latest changes from master

* remove code from releaseJob.yml to add test-deps images to build
---
 .vsts-ci/ltsReleaseStage.yml     |  80 -------------------------
 .vsts-ci/previewReleaseStage.yml | 100 -------------------------------
 .vsts-ci/releaseJob.yml          |   6 --
 .vsts-ci/stableReleaseStage.yml  | 100 -------------------------------
 build.ps1                        |   9 ++-
 5 files changed, 6 insertions(+), 289 deletions(-)

diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index ce016c5bb..b679968a2 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build lts
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -144,63 +124,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index af86ea8a7..2beb159be 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build preview
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian12\test-deps
-      artifactSuffix: debian12_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9\test-deps
-      artifactSuffix: ubi9_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index d796c6454..5ea048866 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -66,12 +66,6 @@ jobs:
   - pwsh: |
       $finalImageName = '${{ parameters.imageName }}'
       $finalContextFolder = 'docker'
-      $testDepsString = 'test-deps'
-      if ($finalImageName.Contains($testDepsString))
-      {
-        $finalImageName = $finalImageName.TrimEnd("\$testDepsString")
-        $finalContextFolder = Join-Path -Path $testDepsString -ChildPath $finalContextFolder
-      }
       $pathToContextFolder = "${{ parameters.channelPath }}/$finalImageName/$finalContextFolder"
       Write-Host "##vso[task.setvariable variable=dockerBuildImageName;isOutput=true]$finalImageName"
       Write-Host "##vso[task.setvariable variable=dockerBuildContextFolder;isOutput=true]$finalContextFolder"
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index 8f270e127..796f5b6ac 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build stable
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian12\test-deps
-      artifactSuffix: debian12_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9\test-deps
-      artifactSuffix: ubi9_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/build.ps1 b/build.ps1
index 514d8d65c..1bcad19d6 100755
--- a/build.ps1
+++ b/build.ps1
@@ -737,10 +737,13 @@ End {
                 foreach ($osGroup in $osGroups) {
                     $architectureGroups = $osGroup.Group | Group-Object -Property Architecture
                     foreach ($architectureGroup in $architectureGroups) {
-                        # Note: For each image to be built (including test-deps images) the <channel>ReleaseStage.yml file needs to have a template call for the image.
+                        # Note: For each image to be built the <channel>ReleaseStage.yml file needs to have a template call for the image.
                         foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
-                            Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
-                            Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
+                            if (!$tag.Name.ToString().Contains('test-deps'))
+                            {
+                                Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
+                                Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
+                            }
                         }
                     }
                 }

From d8a9142f25cbe9a734385f0a7c7a8b98523d9bc1 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 11 Sep 2024 12:00:04 -0400
Subject: [PATCH 333/354] Migrate Release pipeline to OneBranch (#823)

---
 ...werShell-Docker-Image-Release-Official.yml | 417 +++++++++
 .vsts-ci/releasePipeline.yml                  |  58 --
 .../templatesReleasePipeline/releaseJob.yml   | 109 ---
 .../templatesReleasePipeline/releaseStage.yml |  84 --
 .../testAndRelease.yml                        |  15 -
 .vsts-ci/templatesReleasePipeline/testJob.yml | 101 ---
 .../templatesReleasePipeline/testStage.yml    |  69 --
 EV2Specs/ServiceGroupRoot/RolloutSpec.json    |  28 +
 EV2Specs/ServiceGroupRoot/ScopeBindings.json  |  23 +
 EV2Specs/ServiceGroupRoot/ServiceModel.json   |  51 ++
 EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1   | 174 ++++
 .../ServiceGroupRoot/UploadLinux.Rollout.json |  73 ++
 EV2Specs/ServiceGroupRoot/buildver.txt        |   1 +
 build.ps1                                     |  96 +-
 tests/container.tests.ps1                     | 823 +++++++++++++++++-
 tests/containerTestCommon.psm1                |   8 +-
 tools/buildHelper/buildHelper.psm1            |  55 +-
 17 files changed, 1736 insertions(+), 449 deletions(-)
 create mode 100644 .pipelines/PowerShell-Docker-Image-Release-Official.yml
 delete mode 100644 .vsts-ci/releasePipeline.yml
 delete mode 100644 .vsts-ci/templatesReleasePipeline/releaseJob.yml
 delete mode 100644 .vsts-ci/templatesReleasePipeline/releaseStage.yml
 delete mode 100644 .vsts-ci/templatesReleasePipeline/testAndRelease.yml
 delete mode 100644 .vsts-ci/templatesReleasePipeline/testJob.yml
 delete mode 100644 .vsts-ci/templatesReleasePipeline/testStage.yml
 create mode 100644 EV2Specs/ServiceGroupRoot/RolloutSpec.json
 create mode 100644 EV2Specs/ServiceGroupRoot/ScopeBindings.json
 create mode 100644 EV2Specs/ServiceGroupRoot/ServiceModel.json
 create mode 100644 EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1
 create mode 100644 EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json
 create mode 100644 EV2Specs/ServiceGroupRoot/buildver.txt

diff --git a/.pipelines/PowerShell-Docker-Image-Release-Official.yml b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
new file mode 100644
index 000000000..532325ffb
--- /dev/null
+++ b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
@@ -0,0 +1,417 @@
+name: PSDocker-Release-$(Build.BuildId)
+trigger: none
+
+resources:
+  pipelines:
+  - pipeline: BuildPipeline
+    source: PowerShell-Docker-Image-Build-Official
+    trigger:
+      branches:
+        include:
+        - master
+        - master-ado
+        - onebranchbuild
+
+  repositories:
+  - repository: onebranchTemplates
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+  - repository: Internal-PowerShellTeam-Tools
+    type: git
+    trigger: none
+    name: Internal-PowerShellTeam-Tools
+    ref: main-mirror
+
+variables:
+- name: runCodesignValidationInjection
+  value: false
+- name: DisableDockerDetector
+  value: true
+- name: LinuxContainerImage
+  value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
+- name: WindowsContainerImage
+  value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
+- group: PipelineExecutionPats
+- group: Build Docker Group
+
+extends:
+  template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
+  parameters:
+    customTags: 'ES365AIMigrationTooling-BulkMigrated'
+    stages:
+    - stage: GetBuildArtifacts
+      displayName: 'Get artifacts from build pipeline'
+      variables:
+        - name: repoRoot
+          value: $(Build.SourcesDirectory)
+      jobs:
+      - job: DownloadMetaArtifactFromBuild
+        displayName: 'Download BuildInfo.json file from build artifact'
+        variables:
+        - name: ob_outputDirectory
+          value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+        pool:
+          timeoutInMinutes: 30
+          type: windows
+        steps:
+        - download: BuildPipeline
+          artifact: 'drop_StageResolveVersionandYaml_JobResolveVersions'
+          displayName: 'Download BuildInfo.json file from build artifact'
+        - pwsh: |
+            $buildMetadata = Get-Content -Path "$(Pipeline.Workspace)/BuildPipeline/drop_StageResolveVersionandYaml_JobResolveVersions/buildInfo.json" | ConvertFrom-Json
+            $currentChannel = $($buildMetadata.channel)
+            $currentVersion = $($buildMetadata.releaseVersionTag)
+            $finalVersion = $currentVersion.Trim("v")
+            Write-Verbose -Verbose "version: $finalVersion and channel: $currentChannel"
+            Write-Host "##vso[task.setvariable variable=channel;isOutput=true]$currentChannel"
+            Write-Host "##vso[task.setvariable variable=version;isOutput=true]$finalVersion"
+          displayName: 'Get channel from buildInfo.json'
+          name: setChannelStep
+      - job: DownloadImageArtifactFromBuild
+        dependsOn:
+          - DownloadMetaArtifactFromBuild
+        displayName: 'Download image artifacts from build'
+        variables:
+        - name: ob_outputDirectory
+          value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+        - name: channel
+          value: $[ dependencies.DownloadMetaArtifactFromBuild.outputs['setChannelStep.channel'] ]
+        pool:
+          timeoutInMinutes: 30
+          type: windows
+        steps:
+        - checkout: Internal-PowerShellTeam-Tools
+        - pwsh: |
+            Import-Module $(Build.SourcesDirectory)\Internal-PowerShellTeam-Tools\ReleaseTools\AzDO -Force
+            Set-AzDoProjectInfo -ProjectOwner mscodehub -ProjectName PowerShellCore
+            Set-AzDoAuthToken -Token $(mscodehubBuildExecutionPat)
+
+            $triggeredBuildId = "${ENV:RESOURCES_PIPELINE_BUILDPIPELINE_RUNID}"
+            $buildArtifact = Get-AzDOBuildArtifact -Id $triggeredBuildId
+            Write-Verbose -Verbose "build id: $triggeredBuildId"
+            $currentChannel = '$(channel)'
+            $desiredArtifacts = $buildArtifact | Where-Object {$_.name -like "drop_StageGenerateBuild_$($currentChannel)_Job_Build_*" -and $_.name -notlike "*_sdl_analysis" -and $_.name -notlike "*_failed*"}
+
+            $artifactFolderPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'buildArtifacts'
+            $artifactFolderPathExists = Test-Path -Path $artifactFolderPath
+            if (!$artifactFolderPathExists)
+            {
+              New-Item -Path $artifactFolderPath -ItemType Directory
+            }
+            $desiredArtifacts | Receive-AzdoArtifact -Location '$(Pipeline.Workspace)/buildArtifacts' -expand
+          displayName: Download all artifacts
+        - pwsh: |
+            $sourceFilesFolderPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath "SourceFiles"
+            $linuxImagesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "linux"
+            $windowsImagesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "windows"
+            New-Item -Path $linuxImagesFolderPath -ItemType Directory
+            New-Item -Path $windowsImagesFolderPath -ItemType Directory
+          displayName: 'Create Linux and Windows tests folders'
+        - pwsh: |
+            $linuxDistros = @{}
+            $windowsDistros = @{}
+            $buildArtifactsPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'buildArtifacts'
+            $folders = Get-ChildItem $buildArtifactsPath -Exclude '*.zip'
+            $folders | ForEach-Object {
+              $artifactFolderPath = $_.FullName
+              $artifactName = $_.Name
+
+              $fileObj = Get-ChildItem -Path $artifactFolderPath -Filter '*.tar'
+              $srcfilePath = "$($fileObj.FullName)" # example: drop_StageGenerateBuild_stable_Job_Build_Build_linux_amd64_alpine316/alpine316.tar, drop_StageGenerateBuild_stable_Job_Build_Build_linux_amd64_alpine316_test_deps/alpine316.tar
+              $shortImageName = "$($fileObj.BaseName)" # example: alpine316 
+
+              # group main and regular type images by the short image name, i.e group alpine316.tar main and test images
+              if ($artifactName.Contains("linux"))
+              {
+                if (!$linuxDistros.ContainsKey($shortImageName))
+                {
+                  $linuxDistros.Add($shortImageName, @($srcFilePath))
+                }
+                else {
+                  $linuxDistros[$shortImageName] += $srcfilePath
+                }
+              }
+              elseif ($artifactName.Contains("windows"))
+              {
+                if (!$windowsDistros.ContainsKey($shortImageName))
+                {
+                  $windowsDistros.Add($shortImageName, @($srcFilePath))
+                }
+                else {
+                  $windowsDistros[$shortImageName] += $srcfilePath
+                }
+              }
+            }
+
+            $sourceFilesFolderPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath "SourceFiles"
+            $linuxImagesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "linux"
+            $windowsImagesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "windows"
+
+            # Create folder with all linux images to provide to linux-based Tests job:
+            $linuxDistroNames = $linuxDistros.Keys
+            foreach ($name in $linuxDistroNames)
+            {
+              $imageFolderPath = Join-Path -Path $linuxImagesFolderPath -ChildPath $name
+              New-Item -Path $imageFolderPath -ItemType Directory
+              $imageMainPath = Join-Path -Path $imageFolderPath -ChildPath "main"
+              $imageTestPath = Join-Path -Path $imageFolderPath -ChildPath "test"
+              New-Item -Path $imageMainPath -ItemType Directory
+              New-Item -Path $imageTestPath -ItemType Directory
+              $tarFilesForDistro = $linuxDistros[$name]
+              foreach ($tarFilePath in $tarFilesForDistro)
+              {
+                $imageParentFolder = $tarFilePath.Contains("_test_deps") ? $imageTestPath : $imageMainPath
+                $destFilePath = Join-Path -Path $imageParentFolder -ChildPath "$($name).tar"
+                Copy-Item -Path $tarFilePath -Destination $destFilePath
+                Write-Verbose -Verbose "copying: $tarFilePath to dest: $destFilePath"
+              }
+            }
+
+            # Create folder with all windows images to provide windows-based Tests job:
+            $windowsDistroNames = $windowsDistros.Keys
+            foreach ($name in $windowsDistroNames)
+            {
+              $imageFolderPath = Join-Path -Path $windowsImagesFolderPath -ChildPath $name
+              New-Item -Path $imageFolderPath -ItemType Directory
+              $imageMainPath = Join-Path -Path $imageFolderPath -ChildPath "main"
+              $imageTestPath = Join-Path -Path $imageFolderPath -ChildPath "test"
+              New-Item -Path $imageMainPath -ItemType Directory
+              New-Item -Path $imageTestPath -ItemType Directory
+              $tarFilesForDistro = $windowsDistros[$name]
+              foreach ($tarFilePath in $tarFilesForDistro)
+              {
+                $imageParentFolder = $tarFilePath.Contains("_test_deps") ? $imageTestPath : $imageMainPath
+                $destFilePath = Join-Path -Path $imageParentFolder -ChildPath "$($name).tar"
+                Copy-Item -Path $tarFilePath -Destination $destFilePath
+                Write-Verbose -Verbose "copying: $tarFilePath to dest: $destFilePath"
+              }
+            }
+
+            $sourceFilesFolderPath = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath "SourceFiles"
+            $linuxSrcFilesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "linux"
+            $linuxTarGzDestination = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'LinuxSrcFiles.tar.gz'
+            tar -czvf $linuxTarGzDestination -C $linuxSrcFilesFolderPath .
+
+            $windowsSrcFilesFolderPath = Join-Path -Path $sourceFilesFolderPath -ChildPath "windows"
+            $windowsTarGzDestination = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'WindowsSrcFiles.tar.gz'
+            tar -czvf $windowsTarGzDestination -C $windowsSrcFilesFolderPath .
+          displayName: 'Create linux and windows distro folders and copy image files needed into them for Test jobs'
+        - task: CopyFiles@2
+          inputs:
+            SourceFolder: '$(Pipeline.Workspace)'
+            Contents: '*SrcFiles.tar.gz'
+            TargetFolder: $(ob_outputDirectory)
+          displayName: Copy LinuxSrcFiles.tar.gz and WindowsSrcFiles.tar.gz files to $(ob_outputDirectory)
+    - stage: RunTests
+      displayName: 'Run Container Tests'
+      dependsOn:
+      - GetBuildArtifacts
+      variables:
+        - name: repoRoot
+          value: $(Build.SourcesDirectory)
+        - name: channel
+          value: $[ stageDependencies.GetBuildArtifacts.DownloadMetaArtifactFromBuild.outputs['setChannelStep.channel'] ]
+        - name: version
+          value: $[ stageDependencies.GetBuildArtifacts.DownloadMetaArtifactFromBuild.outputs['setChannelStep.version'] ]
+        - name: ob_outputDirectory
+          value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+      jobs:
+      - job: RunLinuxTests
+        pool:
+          type: linux
+          isCustom: true
+          name: PowerShell1ES
+          demands:
+          - ImageOverride -equals PSMMSUbuntu20.04-Secure-120GB
+        steps:
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              targetPath: $(Pipeline.Workspace)
+              pattern: '*LinuxSrcFiles.tar.gz'
+              artifact: drop_GetBuildArtifacts_DownloadImageArtifactFromBuild
+            displayName: 'Download linux SrcFiles.tar.gz artifact, which contains all built images (as .tar files)'
+          - pwsh: |
+              $toolsFolderPath = Join-Path -Path '$(Build.SourcesDirectory)' -ChildPath 'tools'
+              $buildHelperFolderPath = Join-Path -Path $toolsFolderPath -ChildPath 'buildHelper'
+              $buildHelperModulePath = Join-Path -Path $buildHelperFolderPath -ChildPath 'buildHelper.psm1'
+              $pathToTarGz = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'LinuxSrcFiles.tar.gz'
+
+              $pathToImgsFolder = Join-Path -Path '$(Pipeline.Workspace)' -ChildPath 'linuxImages'
+              New-Item -Path $pathToImgsFolder -ItemType Directory
+              tar -xzvf $pathToTarGz -C $pathToImgsFolder
+              $linuxFolders = Get-ChildItem -Path $pathToImgsFolder -Directory
+              foreach ($folder in $linuxFolders)
+              {
+                $folderPath = "$($folder.FullName)"
+                $shortImgName = "$($folder.Name)"
+                .\build.ps1 -Test -Name $shortImgName -Load -LoadPath $folderPath -Channel $(channel) -Version $(version) 
+              }
+            displayName: 'Run Tests for all containers'
+          - task: CopyFiles@2
+            inputs:
+              SourceFolder: '$(Pipeline.Workspace)'
+              Contents: '**/*.testResults.xml'
+              TargetFolder: $(ob_outputDirectory)
+            displayName: Copy test result file to $(ob_outputDirectory)
+    - stage: PrepForEV2
+      displayName: Copy and prep all files needed for EV2 stage
+      dependsOn:
+      - GetBuildArtifacts
+      - RunTests
+      variables:
+        - name: repoRoot
+          value: $(Build.SourcesDirectory)
+      jobs:
+      - job: CopyEv2FilesToArtifact
+        displayName: Copy EV2 Files To Artifact
+        variables:
+        - name: ob_outputDirectory
+          value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
+        - name: channel
+          value: $[ stageDependencies.GetBuildArtifacts.DownloadMetaArtifactFromBuild.outputs['setChannelStep.channel'] ]
+        - name: version
+          value: $[ stageDependencies.GetBuildArtifacts.DownloadMetaArtifactFromBuild.outputs['setChannelStep.version'] ]
+        pool:
+          timeoutInMinutes: 30
+          type: windows
+        steps:
+        - task: onebranch.pipeline.signing@1
+          displayName: Sign 1st party files
+          inputs:
+            command: 'sign'
+            signing_profile: external_distribution
+            files_to_sign: '**\*.ps1'
+            search_root: '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot/Shell'
+        - pwsh: |
+            $srcPath = Join-Path '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot' -ChildPath 'Shell'
+            $pathToRunTarFile = Join-Path '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot/Shell' -ChildPath "Run.tar"
+            tar -cvf $pathToRunTarFile -C $srcPath ./Run
+          displayName: Compress Run script into tar file as needed for EV2 Shell extension
+        - pwsh: |
+            $pathToEV2Folder = Join-Path -Path '$(Build.SourcesDirectory)' -ChildPath 'EV2Specs'
+            $pathToServiceGroupRootFolder = Join-Path $pathToEV2Folder -ChildPath 'ServiceGroupRoot'
+            $pathToParametersFolder = Join-Path -Path $pathToServiceGroupRootFolder -ChildPath 'Parameters'
+            New-Item -Path $pathToParametersFolder -ItemType Directory
+            $pathToImageMetadataFile = Join-Path -Path $pathToParametersFolder -ChildPath 'ImageMetadata.json'
+            $pathToChannelJsonFile = Join-Path -Path $pathToParametersFolder -ChildPath 'ChannelInfo.json'
+            $currentChannel = '$(channel)'
+
+            $channelHash = @{channel=$currentChannel}
+            $channelHash | ConvertTo-Json | Out-File $pathToChannelJsonFile
+
+            $toolsFolderPath = Join-Path -Path '$(Build.SourcesDirectory)' -ChildPath 'tools'
+            $buildHelperFolderPath = Join-Path -Path $toolsFolderPath -ChildPath 'buildHelper'
+            $buildHelperModulePath = Join-Path -Path $buildHelperFolderPath -ChildPath 'buildHelper.psm1'
+            Write-Verbose -Verbose "ipmo path: $buildHelperModulePath"
+            Import-Module $buildHelperModulePath
+            if ($currentChannel -eq "stable")
+            {
+              .\build.ps1 -UpdateImageMetadata -Channel $currentChannel -StableVersion '$(version)' -MetadataFilePath $pathToImageMetadataFile
+            }
+            elseif ($currentChannel -eq "preview")
+            {
+              .\build.ps1 -UpdateImageMetadata -Channel $currentChannel -PreviewVersion '$(version)' -MetadataFilePath $pathToImageMetadataFile
+            }
+            elseif ($currentChannel -eq "lts")
+            {
+              .\build.ps1 -UpdateImageMetadata -Channel $currentChannel -LtsVersion '$(version)' -MetadataFilePath $pathToImageMetadataFile
+            }
+
+            $imgMetaJsonPathExists = Test-Path -Path $pathToImageMetadataFile
+            $channelJsonPathExists = Test-Path -Path $pathToChannelJsonFile
+          displayName: 'Create image metadata json needed for EV2 Shell Extension script'
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            targetPath: '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot/SrcFiles'
+            pattern: '*.tar.gz'
+            artifact: drop_GetBuildArtifacts_DownloadImageArtifactFromBuild
+          displayName: 'Download SrcFiles.tar.gz artifact to copy to $(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot/SrcFiles folder'
+        - pwsh: |
+            $pathToJsonFile = Join-Path -Path '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot' -ChildPath 'UploadLinux.Rollout.json'
+            $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+            $envVarArrayLen = $content.shellExtensions.launch.environmentVariables.Length
+            for ($i=0; $i -lt $envVarArrayLen; $i++)
+            {
+              $name = $($content.shellExtensions.launch.environmentVariables[$i].name)
+              if ($name -eq "DESTINATION_ACR_NAME")
+              {
+                $content.shellExtensions.launch.environmentVariables[$i].value = '$(acr_name)'
+              }
+              elseif ($name -eq "MI_NAME"){
+                $content.shellExtensions.launch.environmentVariables[$i].value = '$(managed_identity_name)'
+              }
+              elseif ($name -eq "MI_CLIENTID")
+              {
+                $content.shellExtensions.launch.environmentVariables[$i].value = '$(managed_identity_clientid)'
+              } 
+            }
+
+            $identityString = "/subscriptions/$(acr_subscription)/resourcegroups/$(acr_resource_group)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$(managed_identity_name)"
+            $content.shellExtensions.launch.identity.userAssignedIdentities[0] = $identityString
+
+            Remove-Item -Path $pathToJsonFile
+            $content | ConvertTo-Json -Depth 6 | Out-File $pathToJsonFile
+          displayName: 'Replace values in UploadLinux.Rollout.json file'
+        - pwsh: |
+            $pathToJsonFile = Join-Path -Path '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot' -ChildPath 'RolloutSpec.json'
+            $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+            $content.RolloutMetadata.Notification.Email.To = '$(email_address)'
+
+            Remove-Item -Path $pathToJsonFile
+            $content | ConvertTo-Json -Depth 4 | Out-File $pathToJsonFile
+          displayName: 'Replace values in RolloutSpecPath.json'
+        - pwsh: |
+            $pathToJsonFile = Join-Path -Path '$(Build.SourcesDirectory)/EV2Specs/ServiceGroupRoot' -ChildPath 'ServiceModel.json'
+            $content = Get-Content -Path $pathToJsonFile | ConvertFrom-Json
+            $content.ServiceResourceGroups[0].AzureResourceGroupName = '$(acr_resource_group)'
+            $content.ServiceResourceGroups[0].AzureSubscriptionId = '$(acr_subscription)'
+
+            Remove-Item -Path $pathToJsonFile
+            $content | ConvertTo-Json -Depth 9 | Out-File $pathToJsonFile
+          displayName: 'Replace values in ServiceModel.json'
+        - task: CopyFiles@2
+          inputs:
+            Contents: 'EV2Specs/**'
+            TargetFolder: $(ob_outputDirectory)
+    - stage:  'Prod_release'
+      displayName: Deploy Images to ACR with EV2
+      dependsOn:
+      - PrepForEV2
+      variables:
+        - name: ob_release_environment
+          value: "Production"
+        - name: repoRoot
+          value: $(Build.SourcesDirectory)
+      jobs:
+      - job: Prod_ReleaseJob
+        pool:
+          type: release
+        steps:
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              targetPath: '$(Pipeline.Workspace)'
+              artifact: drop_PrepForEV2_CopyEv2FilesToArtifact
+            displayName: 'Download drop_PrepForEV2_CopyEv2FilesToArtifact artifact that has all files needed'
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              buildType: 'current'
+              targetPath: '$(Pipeline.Workspace)'
+            displayName: 'Download to get EV2 Files'
+          - task: vsrm-ev2.vss-services-ev2.adm-release-task.ExpressV2Internal@1
+            displayName: 'Ev2: Push to ACR'
+            inputs:
+              UseServerMonitorTask: true
+              EndpointProviderType: ApprovalService
+              ApprovalServiceEnvironment: Production   
+              ServiceRootPath: '$(Pipeline.Workspace)/drop_PrepForEV2_CopyEv2FilesToArtifact/EV2Specs/ServiceGroupRoot'
+              RolloutSpecPath: '$(Pipeline.Workspace)/drop_PrepForEV2_CopyEv2FilesToArtifact/EV2Specs/ServiceGroupRoot/RolloutSpec.json'
+    # - stage: Create_PR
+    #   condition: succeeded()
+    #   dependsOn: ['Release_preview', 'Release_stable', 'Release_lts']
+    #   displayName: Create McrDocs Pr
+    #   jobs:
+    #   - deployment: ReleaseAutomationKickOff
+    #     displayName: Create McrDocs Pr
+    #     pool: server
+    #     environment: PSDockerMcrDocs
diff --git a/.vsts-ci/releasePipeline.yml b/.vsts-ci/releasePipeline.yml
deleted file mode 100644
index 749e43a4e..000000000
--- a/.vsts-ci/releasePipeline.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-trigger: none
-
-# needed to disable CI trigger and allow manual trigger
-# when the branch is same as pipline source, the latest build from the source is used.
-# all environment used are for manual tasks and approvals.
-
-parameters:
-  - name: WhatIf
-    default: "No"
-    displayName: "Only show what would be done"
-
-resources:
-  pipelines:
-  - pipeline: releasePipeline
-    source: 'Build Docker Images'
-    trigger:
-      branches:
-      - master
-
-variables:
-  runCodesignValidationInjection: false
-  DisableDockerDetector: true
-
-stages:
-- template: ./templatesReleasePipeline/testAndRelease.yml
-  parameters:
-    channel: "preview"
-    WhatIf: ${{ parameters.WhatIf }}
-
-- template: ./templatesReleasePipeline/testAndRelease.yml
-  parameters:
-    channel: "stable"
-    WhatIf: ${{ parameters.WhatIf }}
-
-- template: ./templatesReleasePipeline/testAndRelease.yml
-  parameters:
-    channel: "lts"
-    WhatIf: ${{ parameters.WhatIf }}
-
-- stage: Approve_Release
-  condition: succeeded()
-  dependsOn: ['test_preview','test_stable','test_lts']
-  displayName: Approve Release
-  jobs:
-  - deployment: ReleaseAutomationKickOff
-    displayName: Approve Release
-    pool: server
-    environment: PSDockerMcrRelease
-
-- stage: Create_PR
-  condition: succeeded()
-  dependsOn: ['Release_preview','Release_stable','Release_lts']
-  displayName: Create McrDocs Pr
-  jobs:
-  - deployment: ReleaseAutomationKickOff
-    displayName: Create McrDocs Pr
-    pool: server
-    environment: PSDockerMcrDocs
diff --git a/.vsts-ci/templatesReleasePipeline/releaseJob.yml b/.vsts-ci/templatesReleasePipeline/releaseJob.yml
deleted file mode 100644
index 385e9f42d..000000000
--- a/.vsts-ci/templatesReleasePipeline/releaseJob.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-parameters:
-  - name: vmImage
-    default: PSMMSUbuntu20.04-Secure
-  - name: jobName
-    default: 'none'
-  - name: releaseTag
-    default: ''
-  - name: ACR
-    default: 'No'
-  - name: maxParallel
-    default: 5
-  - name: dependsOn
-    default: []
-    type: object
-  - name: WhatIf
-    default: 'no'
-  - name: matrix
-    default: ''
-
-jobs:
-  - job: ${{ parameters.jobName }}
-    dependsOn:
-      ${{ parameters.dependsOn }}
-    strategy:
-        matrix: $[ ${{ parameters.matrix }} ]
-        maxParallel: ${{ parameters.maxParallel }}
-    variables:
-      - group: 'Staging_ACR'
-      - name: 'dockerImage'
-        value: 'powershell'
-      - name: "ACR"
-        value: ${{ parameters.ACR }}
-      - name: "releaseTag"
-        value: ${{ parameters.releaseTag }}
-      - name: "WhatIf"
-        value: ${{ parameters.WhatIf }}
-
-    pool:
-      name: PowerShell1ES
-      demands:
-        - ImageOverride -equals ${{ parameters.vmImage }}
-
-    timeoutInMinutes: 30
-
-    displayName: ${{ parameters.jobName }}
-
-    steps:
-    - download: releasePipeline
-      displayName: Download build meta json
-      artifact: buildMeta
-      patterns: '**/*.json'
-
-    - download: releasePipeline
-      displayName: Download release tags json
-      artifact: releaseTags
-      patterns: '**/*.json'
-    - pwsh: |
-            $json = Get-ChildItem "$ENV:PIPELINE_WORKSPACE/buildmeta.json" -recurse -File
-            if($json.Count -ge 1)
-            {
-                $jsonText = Get-Content -Path $json.FullName
-                $fullTag = ($jsonText | ConvertFrom-Json).FullTag
-                Write-Verbose "setting FULL_TAG to $fullTag" -verbose
-                Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
-            }
-            else{
-                Write-Verbose "Did not find buildmeta json" -verbose
-            }
-      displayName: 'Set Full Tag'
-
-    - task: PowerShell@2
-      displayName: 'Deserialize Release Tags'
-      inputs:
-        targetType: 'filePath'
-        filePath: .vsts-ci/templatesGeneric/deserializeTags.ps1
-        pwsh: true
-
-    - template: ../templatesGeneric/setVersionStepsTemplate.yml
-
-    - pwsh: |
-        Get-ChildItem env: | Out-String -Width 1000
-      displayName: 'Capture Environment'
-
-    - pwsh: 'az login --service-principal -u $(az_url) -p $(az_key) --tenant $(az_name)'
-      displayName: 'az login'
-
-    - pwsh: |
-            az account set --subscription $(AcrSubscriptionName)
-            $tags = ./build.ps1 -GenerateTagsYaml -Channel $(channel) -Name $(imagename) -Format JSON -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion) | convertfrom-json
-            $repos = @($tags | get-member -MemberType NoteProperty  | Select-Object -ExpandProperty Name)
-
-            foreach($repo in $repos) {
-              foreach($tag in $tags.$repo.tags) {
-                $name = $repo + ":" + $tag
-                $stagingRepo = ($repo -replace 'public/', 'public/$(dockerNamespace)/') -replace 'internal/', 'internal/$(dockerNamespace)/'
-                Write-verbose "Running: az acr import --name $(productionACR) --source '$(dockerHost)/${stagingRepo}:$tag' --image '${repo}:$tag' --force" -verbose
-                if($env:WHATIF -eq 'No') {
-                  az acr import --name $(productionACR) --source "$(dockerHost)/${stagingRepo}:$tag" --image "${repo}:$tag" --force
-                } else {
-                  Write-verbose "skipping import due to whatif" -verbose
-                }
-              }
-            }
-      displayName: 'release - $(channel) - $(imagename)'
-      condition: and( succeeded(), ne(variables['Channel'],''))
-
-    - pwsh: 'az logout'
-      displayName: 'az logout'
-      condition: always()
diff --git a/.vsts-ci/templatesReleasePipeline/releaseStage.yml b/.vsts-ci/templatesReleasePipeline/releaseStage.yml
deleted file mode 100644
index 9f28d022e..000000000
--- a/.vsts-ci/templatesReleasePipeline/releaseStage.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-parameters:
-    - name: "channel"
-      default: 'preview'
-    - name: "vmImage"
-      default: PSMMSUbuntu20.04-Secure
-    - name: "acr"
-      default: 'All'
-    - name: "useacr"
-      default: 'false'
-    - name: "osFilter"
-      default: 'All'
-    - name: "WhatIf"
-      default: 'No'
-
-
-stages:
-    - stage: Release_${{ parameters.channel }}
-      condition: succeeded()
-      dependsOn: ['Approve_Release']
-      displayName: Release ${{ parameters.channel }}
-      jobs:
-      - job: GenerateYaml_${{ parameters.channel }}
-        pool:
-          name: PowerShell1ES
-          demands:
-            - ImageOverride -equals ${{ parameters.vmImage }}
-
-        displayName: Generate Matrix YAML ${{ parameters.channel }}
-        steps:
-
-          - pwsh: |
-              ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter  ${{ parameters.osFilter }}
-            displayName: Generate Matrix YAML
-            condition: succeededOrFailed()
-            name: matrix
-
-          - pwsh: |
-              dir env:matrix_* | out-string -Width 1000
-            displayName: Capture Matrix YAML
-            condition: succeededOrFailed()
-
-      - template: ./releaseJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_${{ parameters.osFilter }}_x64
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
-          WhatIf: ${{ parameters.WhatIf }}
-          vmImage: "PSMMS2019-Secure"
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-      - template: ./releaseJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux_x64
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
-          WhatIf: ${{ parameters.WhatIf }}
-          vmImage: "PSMMSUbuntu20.04-Secure"
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-      - template: ./releaseJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux_arm64
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
-          WhatIf: ${{ parameters.WhatIf }}
-          vmImage: "PSMMSUbuntu20.04-Secure"
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-            
-      - template: ./releaseJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux_arm32
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
-          WhatIf: ${{ parameters.WhatIf }}
-          vmImage: "PSMMSUbuntu20.04-Secure"
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-    - stage: Release_ManifestList_${{ parameters.channel }}
-      jobs:
-      - template: ./releaseManifestList.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_manifest_list
-          channel: ${{ parameters.channel }}
-          WhatIf: ${{ parameters.WhatIf }}
diff --git a/.vsts-ci/templatesReleasePipeline/testAndRelease.yml b/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
deleted file mode 100644
index 7000bc0c3..000000000
--- a/.vsts-ci/templatesReleasePipeline/testAndRelease.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-    - name: "channel"
-      default: 'preview'
-    - name: "WhatIf"
-      default: 'No'
-
-stages:
-- template: ./testStage.yml
-  parameters:
-    channel: ${{ parameters.channel }}
-
-- template: ./releaseStage.yml
-  parameters:
-    channel: ${{ parameters.channel }}
-    WhatIf: ${{ parameters.WhatIf }}
diff --git a/.vsts-ci/templatesReleasePipeline/testJob.yml b/.vsts-ci/templatesReleasePipeline/testJob.yml
deleted file mode 100644
index bbeb35d9e..000000000
--- a/.vsts-ci/templatesReleasePipeline/testJob.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-parameters:
-  vmImage: 'ubuntu-latest'
-  jobName: 'none'
-  releaseTag: ''
-  ACR: 'no'
-  maxParallel: 5
-  dependsOn: []
-  tafFilter: ''
-
-jobs:
-  - job: ${{ parameters.jobName }}
-    dependsOn:
-      ${{ parameters.dependsOn }}
-    strategy:
-        matrix: $[ ${{ parameters.matrix }} ]
-        maxParallel: ${{ parameters.maxParallel }}
-    variables:
-      - group: 'Staging_ACR'
-      - name: 'dockerImage'
-        value: 'powershell'
-      - name: "Channel"
-        value: ${{ parameters.channel }}
-      - name: "ACR"
-        value: ${{ parameters.ACR }}
-      - name: "releaseTag"
-        value: ${{ parameters.releaseTag }}
-
-    pool:
-      vmImage: ${{ parameters.vmImage }}
-
-    timeoutInMinutes: 30
-
-    displayName: ${{ parameters.jobName }}
-
-    steps:
-    - download: releasePipeline
-      displayName: Download build meta json
-      artifact: buildMeta
-      patterns: '**/*.json'
-
-    - download: releasePipeline
-      displayName: Download release tags json
-      artifact: releaseTags
-      patterns: '**/*.json'
-
-    - pwsh: ' Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99'
-      displayName: 'Install Pester'
-    - pwsh: |
-            $json = Get-ChildItem "${ENV:PIPELINE_WORKSPACE}/buildmeta.json" -recurse -File
-            if($json.Count -ge 1)
-            {
-                $jsonText = Get-Content -Path $json.FullName
-                $fullTag = ($jsonText | ConvertFrom-Json).FullTag
-                Write-Verbose "setting FULL_TAG to $fullTag" -verbose
-                Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
-            }
-            else{
-                Write-Verbose "Did not find buildmeta json" -verbose
-            }
-      displayName: 'Set Full Tag'
-
-    - task: PowerShell@2
-      displayName: 'Deserialize Release Tags'
-      inputs:
-        targetType: 'filePath'
-        filePath: .vsts-ci/templatesGeneric/deserializeTags.ps1
-        pwsh: true
-
-    - template: ../templatesGeneric/setVersionStepsTemplate.yml
-
-    - pwsh: |
-        Get-ChildItem env: | Out-String -Width 1000
-      displayName: 'Capture Environment'
-
-    - pwsh: 'docker login $(dockerHost) -u $(dockerUserName) -p "$(dockerKey)"'
-      displayName: 'docker login'
-
-    - pwsh: |
-            $tagFilter = '${{ parameters.tagFilter}}'
-            $extraParams = @{}
-            if($tagFilter)
-            {
-              $extraParams.Add('TagFilter',$tagFilter)
-            }
-            .\build.ps1 -test -Channel $(Channel) -Pull -ImageName $(dockerHost) -name '$(ImageName)' -Version $(Version) -TestLogPostfix windows-$(Channel) -Repository $(dockerNamespace)/powershell @extraParams
-      displayName: 'Run Tests for $(Channel) - $(ImageName)'
-      condition: and( succeeded(), ne(variables['Channel'],''))
-
-
-    - task: PublishTestResults@2
-      displayName: 'Publish Test Results **/test*.xml'
-      inputs:
-        testResultsFormat: NUnit
-        testResultsFiles: '**/test*.xml'
-        testRunTitle: 'Linux $(Channel)'
-      continueOnError: true
-      condition: succeededOrFailed()
-
-    - pwsh: 'docker logout'
-      displayName: 'docker logout'
-      condition: always()
diff --git a/.vsts-ci/templatesReleasePipeline/testStage.yml b/.vsts-ci/templatesReleasePipeline/testStage.yml
deleted file mode 100644
index 0b96d1457..000000000
--- a/.vsts-ci/templatesReleasePipeline/testStage.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-parameters:
-    - name: "channel"
-      default: 'preview'
-    - name: "vmImage"
-      default: 'ubuntu-latest'
-    - name: "acr"
-      default: 'All'
-    - name: "useacr"
-      default: 'false'
-    - name: "osFilter"
-      default: 'All'
-
-stages:
-    - stage: Test_${{ parameters.channel }}
-      dependsOn: []
-      displayName: Test ${{ parameters.channel }}
-      variables:
-        - name: docker_release
-          value: True
-      jobs:
-      - job: GenerateYaml_${{ parameters.channel }}
-        pool:
-          vmImage: ubuntu-latest
-
-        displayName: Generate Matrix YAML ${{ parameters.channel }}
-        steps:
-        - pwsh: |
-            ./build.ps1 -GenerateMatrixJson -Channel ${{ parameters.channel }} -Verbose -Acr ${{ parameters.acr }} -OsFilter ${{ parameters.osFilter }}
-          displayName: Generate Matrix YAML
-          condition: succeededOrFailed()
-          name: matrix
-        - pwsh: |
-            dir env:matrix_* | out-string -Width 1000
-          displayName: Capture Matrix YAML
-          condition: succeededOrFailed()
-
-      - template: ./testJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_windows
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_windows_amd64']
-          vmImage: windows-latest
-          tagfilter: 1809
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-      - template: ./testJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_amd64']
-          vmImage: ubuntu-latest
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-      - template: ./testJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux_arm64
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm64']
-          vmImage: ubuntu-latest
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
-      - template: ./testJob.yml
-        parameters:
-          jobName: ${{ parameters.channel }}_linux_arm32
-          matrix: dependencies.GenerateYaml_${{ parameters.channel }}.outputs['matrix.matrix_${{ parameters.channel }}_linux_arm32']
-          vmImage: ubuntu-latest
-          dependsOn:
-            - GenerateYaml_${{ parameters.channel }}
-
diff --git a/EV2Specs/ServiceGroupRoot/RolloutSpec.json b/EV2Specs/ServiceGroupRoot/RolloutSpec.json
new file mode 100644
index 000000000..7166fcf18
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/RolloutSpec.json
@@ -0,0 +1,28 @@
+{
+    "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/rolloutSpecification.json",
+    "contentVersion": "1.0.0.0",
+    "RolloutMetadata": {
+      "ServiceModelPath": "ServiceModel.json",
+      "ScopeBindingsPath": "ScopeBindings.json",
+      "Name": "OneBranch-Demo-Container-Deployment",
+      "RolloutType": "Major",
+      "BuildSource": {
+        "Parameters": {
+          "VersionFile": "buildver.txt"
+        }
+      },
+      "Notification": {
+        "Email": {
+          "To": "default"
+        }
+      }
+    },
+    "OrchestratedSteps": [
+      {
+        "Name": "UploadLinuxContainer",
+        "TargetType": "ServiceResource",
+        "TargetName": "LinuxContainerUpload",
+        "Actions": ["Shell/Run"]
+      }
+    ]
+  }
diff --git a/EV2Specs/ServiceGroupRoot/ScopeBindings.json b/EV2Specs/ServiceGroupRoot/ScopeBindings.json
new file mode 100644
index 000000000..d25d5a7e0
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/ScopeBindings.json
@@ -0,0 +1,23 @@
+{
+    "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/scopeBindings.json",
+    "contentVersion": "0.0.0.1",
+    "scopeBindings": [
+      {
+        "scopeTagName": "Global",
+        "bindings": [
+          {
+            "find": "__SUBSCRIPTION_ID__",
+            "replaceWith": "$azureSubscriptionId()"
+          },
+          {
+            "find": "__RESOURCE_GROUP__",
+            "replaceWith": "$azureResourceGroup()"
+          },
+          {
+            "find": "__BUILD_VERSION__",
+            "replaceWith": "$buildVersion()"
+          }
+        ]
+      }
+    ]
+  }
diff --git a/EV2Specs/ServiceGroupRoot/ServiceModel.json b/EV2Specs/ServiceGroupRoot/ServiceModel.json
new file mode 100644
index 000000000..345242272
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/ServiceModel.json
@@ -0,0 +1,51 @@
+{
+    "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/serviceModel.json",
+    "contentVersion": "1.0.0.0",
+    "ServiceMetadata": {
+      "ServiceGroup": "OneBranch-PowerShellDocker",
+      "Environment": "Test"
+    },
+    "ServiceResourceGroupDefinitions": [
+      {
+        "Name": "OneBranch-PowerShellDocker-RGDef",
+        "ServiceResourceDefinitions": [
+          {
+            "Name": "OneBranch-PowerShellDocker.Shell-SRDef",
+            "composedOf": {
+              "extension": {
+                "shell": [
+                  {
+                    "type": "Run",
+                    "properties": {
+                      "imageName": "adm-mariner-20-l",
+                      "imageVersion": "v5"
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "ServiceResourceGroups": [
+      {
+        "AzureResourceGroupName": "default",
+        "Location": "East US",
+        "InstanceOf": "OneBranch-PowerShellDocker-RGDef",
+        "AzureSubscriptionId": "default",
+          "scopeTags": [
+            {
+              "name": "Global"
+            }
+          ],
+        "ServiceResources": [
+          {
+            "Name": "LinuxContainerUpload",
+            "InstanceOf": "OneBranch-PowerShellDocker.Shell-SRDef",
+            "RolloutParametersPath": "UploadLinux.Rollout.json"
+          }
+        ]
+      }
+    ]
+  }
diff --git a/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1 b/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1
new file mode 100644
index 000000000..07df55c65
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/Shell/Run/Run.ps1
@@ -0,0 +1,174 @@
+# ensure SAS variables were passed in
+if ($env:LINUX_IMAGES_TARGZIP -eq $null)
+{
+    Write-Verbose -Verbose "LINUX_IMAGES_TARGZIP variable didn't get passed correctly"
+    return 1
+}
+
+if ($env:WINDOWS_IMAGES_TARGZIP -eq $null)
+{
+    Write-Verbose -Verbose "WINDOWS_IMAGES_TARGZIP variable didn't get passed correctly"
+    return 1
+}
+
+if ($env:DESTINATION_ACR_NAME -eq $null)
+{
+    Write-Verbose -Verbose "DESTINATION_ACR_NAME variable didn't get passed correctly"
+    return 1
+}
+
+if ($env:MI_CLIENTID -eq $null)
+{
+    Write-Verbose -Verbose "MI_CLIENTID variable didn't get passed correctly"
+    return 1
+}
+
+if ($env:IMAGE_INFO_JSON -eq $null)
+{
+    Write-Verbose -Verbose "IMAGE_INFO_JSON variable didn't get parsed properly"
+    return 1
+}
+
+if ($env:CHANNEL_INFO_JSON -eq $null)
+{
+    Write-Verbose -Verbose "CHANNEL_INFO_JSON variable didn't get parsed properly"
+    return 1
+}
+
+try {
+    Write-Verbose -Verbose "LinuxSrcFiles.tar.gz: $env:LINUX_IMAGES_TARGZIP"
+    Write-Verbose -Verbose "WindowsSrcFiles.tar.gz: $env:WINDOWS_IMAGES_TARGZIP"
+    Write-Verbose -Verbose "acrname: $env:DESTINATION_ACR_NAME"
+    Write-Verbose -Verbose "MI client Id: $env:MI_CLIENTID"
+    Write-Verbose -Verbose "imginfo: $env:IMAGE_INFO_JSON"
+    Write-Verbose -Verbose "channel info file: $env:CHANNEL_INFO_JSON"
+
+    Write-Verbose -Verbose "Download files"
+    Invoke-WebRequest -Uri $env:LINUX_IMAGES_TARGZIP -OutFile LinuxSrcFiles.tar.gz
+    Invoke-WebRequest -Uri $env:WINDOWS_IMAGES_TARGZIP -OutFile WindowsSrcFiles.tar.gz
+    Invoke-WebRequest -Uri $env:IMAGE_INFO_JSON -OutFile ImageMetadata.json
+    Invoke-WebRequest -Uri $env:CHANNEL_INFO_JSON -OutFile ChannelInfo.json
+
+    $liunxPathToTarGz = Join-Path -Path "/package/unarchive/" -ChildPath "LinuxSrcFiles.tar.gz"
+    $linuxPathToTarGzExists = Test-Path $liunxPathToTarGz
+    Write-Verbose -Verbose "LinuxSrcFiles.tar.gz exists: $linuxPathToTarGzExists"
+
+    $windowsPathToTarGz = Join-Path -Path "/package/unarchive/" -ChildPath "WindowsSrcFiles.tar.gz"
+    $windowsPathToTarGzExists = Test-Path $windowsPathToTarGz
+    Write-Verbose -Verbose "WindowsSrcFiles.tar.gz exists: $windowsPathToTarGzExists"
+
+    $pathToChannelJson = Join-Path "/package/unarchive/" -ChildPath "ChannelInfo.json"
+    $pathToChannelJsonExists = Test-Path $pathToChannelJson
+    Write-Verbose -Verbose "ChannelInfo.json file exists: $pathToChannelJsonExists"
+
+    $pathToImgMetadataJson = Join-Path -Path "/package/unarchive/" -ChildPath "ImageMetadata.json"
+    $pathToImgMetadataJsonExists = Test-Path $pathToImgMetadataJson
+    Write-Verbose -Verbose "ImageMetadata.json file exists: $pathToImgMetadataJsonExists"
+
+    # Expected file structure:
+    # images
+    #   - linux
+    #       - distro1
+    #           - main
+    #               - distro1.tar
+    #           - test
+    #               - distro1.tar
+    #   - windows
+    #       - distro2
+    #           - main
+    #               - distro2.tar
+    #           - test
+    #               - distro2.tar
+    Write-Verbose -Verbose "Getting image .tar files"
+    $unarchivePath = Join-Path -Path "/package" -ChildPath "unarchive"
+    $unarchivePathExists = Test-Path -Path $unarchivePath
+    Write-Verbose -Verbose "unarchive path exists: $unarchivePathExists"
+    $imagesFolder = Join-Path -Path "/package/unarchive/" -ChildPath "images"
+    New-Item -Path $imagesFolder -ItemType Directory
+    $imagesFolderExists = Test-Path $imagesFolder
+    Write-Verbose -Verbose "images folder exists: $imagesFolderExists"
+
+    $linuxImagesFolder = Join-Path -Path $imagesFolder -ChildPath "linux"
+    New-Item -Path $linuxImagesFolder -ItemType Directory
+    $linuxFolderExists = Test-Path $linuxImagesFolder
+    Write-Verbose -Verbose "linux folder exists: $linuxFolderExists"
+    tar -xzvf $liunxPathToTarGz -C $linuxImagesFolder --force-local
+
+    $windowsImagesFolder = Join-Path -Path $imagesFolder -ChildPath "windows"
+    New-Item -Path $windowsImagesFolder -ItemType Directory
+    $windowsFolderExists = Test-Path -Path $windowsImagesFolder
+    Write-Verbose -Verbose "windows folder exists: $windowsFolderExists"
+    tar -xzvf $windowsPathToTarGz -C $windowsImagesFolder --force-local
+
+    Write-Verbose -Verbose "Login cli using managed identity"
+    az login --identity --username $env:MI_CLIENTID
+
+    Write-Verbose -Verbose "Getting ACR credentials"
+    $token_query_res = az acr login -n "$env:DESTINATION_ACR_NAME" -t
+    $token_query_json = $token_query_res | ConvertFrom-Json
+    $token = $token_query_json.accessToken
+    $destinationACR = $token_query_json.loginServer
+
+    # Crane 0.15.2 comes installed on image, but has issue pushing foreign layers for windows containers.
+    # This issue does not occur with version 0.19.0+ so we must download it.
+    Write-Verbose -Verbose "Download crane version 0.19.0"
+    wget -O crane.tar.gz https://github.com/google/go-containerregistry/releases/download/v0.19.1/go-containerregistry_Linux_x86_64.tar.gz
+    gunzip crane.tar.gz
+    tar -xvf crane.tar
+
+    ./crane version
+    ./crane auth login "$destinationACR" -u "00000000-0000-0000-0000-000000000000" -p "$token"
+    Write-Verbose -Verbose "after crane auth"
+
+    Write-Verbose -Verbose "Getting channel info"
+    $channelJsonFileContent = Get-Content -Path $pathToChannelJson | ConvertFrom-Json
+    $channel = $channelJsonFileContent.channel
+
+    Write-Verbose -Verbose "Getting image info"
+    $imgJsonFileContent = Get-Content -Path $pathToImgMetadataJson | ConvertFrom-Json
+    $images = $imgJsonFileContent.$channel
+
+    Write-Verbose -Verbose "Push images to ACR"
+    foreach ($image in $images)
+    {
+        $name = $image.name
+        if (!$name.Contains("test-deps"))
+        {
+            $imageOS = $image.os
+            $tags = $image.tags.Split(' ')
+            $tarballFileName = "$name.tar"
+    
+            $osFolder = Join-Path $imagesFolder -ChildPath $imageOS
+            $currentImageFolder = Join-Path $osFolder -ChildPath $name
+            $mainImageFolder = Join-Path $currentImageFolder -ChildPath "main"
+            $tarballFilePath = Join-Path $mainImageFolder -ChildPath $tarballFileName
+    
+            $tarballFilePathExists = Test-Path -Path $tarballFilePath
+            Write-Verbose -Verbose "name: $name os: $imageOS tarballFilePath: $tarBallFilePath exists: $tarballFilePathExists"
+    
+            if ($tarballFilePathExists)
+            {
+                foreach ($tag in $tags)
+                {
+                    Write-Verbose -Verbose "tag: $tag"
+                    # Need to push image for each tag
+                    $destination_image_full_name = "$env:DESTINATION_ACR_NAME.azurecr.io/public/powershell:${tag}"
+                    Write-Verbose -Verbose "dest img full name: $destination_image_full_name"
+                    Write-Verbose -Verbose "Pushing file $tarballFilePath to $destination_image_full_name"
+                    ./crane push $tarballFilePath $destination_image_full_name
+                    Write-Verbose -Verbose "done pushing for tag: $tag"
+                }
+            }
+            else {
+                Write-Verbose -Verbose "tarballFilePath: $tarBallFilePath does not exist"
+            }
+        }
+    }
+
+    Write-Verbose -Verbose "script finished running successfully"
+}
+catch {
+    return 1
+}
+
+return 0
diff --git a/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json b/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json
new file mode 100644
index 000000000..0810eb2b5
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/UploadLinux.Rollout.json
@@ -0,0 +1,73 @@
+{
+    "$schema": "https://ev2schema.azure.net/schemas/2020-01-01/rolloutParameters.json",
+    "contentVersion": "1.0.0.0",
+    "shellExtensions": [
+      {
+        "name": "Run",
+        "type": "Run",
+        "properties": {
+          "maxExecutionTime": "PT2H"
+        },
+        "package": {
+          "reference": {
+            "path": "Shell/Run.tar"
+          }
+        },
+        "launch": {
+          "command": [
+            "/bin/bash",
+            "-c",
+            "pwsh ./Run/Run.ps1"
+          ],
+          "environmentVariables": [
+            {
+              "name": "IMAGE_INFO_JSON",
+              "reference":
+              {
+                  "path": "Parameters\\ImageMetadata.json"
+              }
+            },
+            {
+              "name": "CHANNEL_INFO_JSON",
+              "reference":
+              {
+                  "path": "Parameters\\ChannelInfo.json"
+              }
+            },
+            {
+              "name": "DESTINATION_ACR_NAME",
+              "value": "default"
+            },
+            {
+              "name": "MI_NAME",
+              "value": "default"
+            },
+            {
+              "name": "MI_CLIENTID",
+              "value": "default"
+            },
+            {
+              "name": "LINUX_IMAGES_TARGZIP",
+              "reference": {
+                "path": "SrcFiles\\LinuxSrcFiles.tar.gz"
+              },
+              "asSecureValue": "true"
+            },
+            {
+              "name": "WINDOWS_IMAGES_TARGZIP",
+              "reference": {
+                "path": "SrcFiles\\WindowsSrcFiles.tar.gz"
+              },
+              "asSecureValue": "true"
+            }
+          ],
+          "identity": {
+            "type": "userAssigned",
+            "userAssignedIdentities": [
+              "default"
+            ]
+          }
+        }
+      }
+    ]
+  }
diff --git a/EV2Specs/ServiceGroupRoot/buildver.txt b/EV2Specs/ServiceGroupRoot/buildver.txt
new file mode 100644
index 000000000..7f207341d
--- /dev/null
+++ b/EV2Specs/ServiceGroupRoot/buildver.txt
@@ -0,0 +1 @@
+1.0.1
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 1bcad19d6..82c388219 100755
--- a/build.ps1
+++ b/build.ps1
@@ -31,6 +31,14 @@ param(
     [switch]
     $Pull,
 
+    [Parameter(Mandatory, ParameterSetName="TestByName")]
+    [switch]
+    $Load,
+
+    [Parameter(Mandatory, ParameterSetName="TestByName")]
+    [string]
+    $LoadPath,
+
     [Parameter(Mandatory, ParameterSetName="GenerateMatrixJson")]
     [switch]
     $GenerateMatrixJson,
@@ -39,6 +47,14 @@ param(
     [switch]
     $UpdateBuildYaml,
 
+    [Parameter(Mandatory, ParameterSetName="UpdateImageMetadata")]
+    [switch]
+    $UpdateImageMetadata,
+
+    [Parameter(Mandatory, ParameterSetName="UpdateImageMetadata")]
+    [string]
+    $MetadataFilePath,
+
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [switch]
     $FullJson,
@@ -118,6 +134,7 @@ param(
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="UpdateBuildYaml")]
+    [Parameter(ParameterSetName="UpdateImageMetadata")]
     [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -126,6 +143,7 @@ param(
 
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="UpdateBuildYaml")]
+    [Parameter(ParameterSetName="UpdateImageMetadata")]
     [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -134,6 +152,7 @@ param(
 
     [Parameter(ParameterSetName="GenerateManifestLists")]
     [Parameter(ParameterSetName="UpdateBuildYaml")]
+    [Parameter(ParameterSetName="UpdateImageMetadata")]
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [Parameter(ParameterSetName="GenerateTagsYaml")]
     [ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
@@ -186,7 +205,7 @@ DynamicParam {
     $dockerFileNames = @()
     Get-ImageList -Channel $imageChannel | ForEach-Object { $dockerFileNames += $_ }
 
-    # Create the parameter attributs
+    # Create the parameter attributes
     $Attributes = [System.Collections.ObjectModel.Collection[System.Attribute]]::new()
 
     Add-ParameterAttribute -ParameterSetName 'TestByName' -Attributes $Attributes
@@ -221,6 +240,7 @@ DynamicParam {
     Add-ParameterAttribute -ParameterSetName 'DupeCheck' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GenerateMatrixJson' -Attributes $channelAttributes -Mandatory $false
     Add-ParameterAttribute -ParameterSetName "UpdateBuildYaml" -Attributes $channelAttributes -Mandatory $false
+    Add-ParameterAttribute -ParameterSetName "UpdateImageMetadata" -Attributes $channelAttributes -Mandatory $false
     Add-ParameterAttribute -ParameterSetName 'GenerateTagsYaml' -Attributes $channelAttributes
     Add-ParameterAttribute -ParameterSetName 'GenerateManifestLists' -Attributes $channelAttributes
 
@@ -245,7 +265,18 @@ Begin {
 
     $ENV:DOCKER_BUILDKIT = 1
 
-    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'UpdateBuildYaml', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
+    if ($Load.IsPresent)
+    {
+        $loadPathExists = Test-Path -Path $LoadPath
+        if (!$loadPathExists)
+        {
+            throw "Folder specified at $LoadPath does not exist"
+        }
+
+        $ENV:LOAD_PATH = $LoadPath
+    }
+
+    if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'UpdateBuildYaml', 'UpdateImageMetadata', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"
     }
@@ -446,7 +477,7 @@ End {
                     }
                 }
             }
-            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $GenerateManifestLists.IsPresent) {
+            elseif ($GenerateTagsYaml.IsPresent -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $UpdateImageMetadata.IsPresent -or $GenerateManifestLists.IsPresent) {
                 if($Acr -eq 'OnlyAcr' -and !$useAcr)
                 {
                     continue
@@ -479,7 +510,7 @@ End {
 
                 $osVersion = $allMeta.meta.osVersion
                 $manifestLists = $allMeta.meta.ManifestLists
-                if($osVersion -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $GenerateManifestLists.IsPresent)
+                if($osVersion -or $GenerateMatrixJson.IsPresent -or $UpdateBuildYaml.IsPresent -or $UpdateImageMetadata.IsPresent -or $GenerateManifestLists.IsPresent)
                 {
                     if ($osVersion) {
                         $osVersion = $osVersion.replace('${fromTag}', $actualTagData.fromTag)
@@ -536,11 +567,16 @@ End {
         $extraParams = @{}
         if($Test.IsPresent)
         {
-            $tags = @('Behavior')
+            $tags = @()
             if($Pull.IsPresent)
             {
+                $tags += 'Behavior'
                 $tags += 'Pull'
             }
+            elseif ($Load.IsPresent) {
+                $tags += 'LoadBehavior'
+                $tags += 'Load'
+            }
 
             $extraParams.Add('Tags',$tags)
         }
@@ -567,8 +603,8 @@ End {
         Invoke-PesterWrapper -Script $testsPath -OutputFile $logPath -ExtraParams $extraParams
     }
 
-    Write-Verbose "!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$GenerateManifestLists -and '$($PSCmdlet.ParameterSetName)' -notlike '*All'" -Verbose
-    if (!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$GenerateManifestLists -and $PSCmdlet.ParameterSetName -notlike '*All') {
+    Write-Verbose "!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$UpdateImageMetadata -and !$GenerateManifestLists -and !$Load -and '$($PSCmdlet.ParameterSetName)' -notlike '*All'" -Verbose
+    if (!$GenerateTagsYaml -and !$GenerateMatrixJson -and !$UpdateBuildYaml -and !$UpdateImageMetadata -and !$GenerateManifestLists -and !$Load -and $PSCmdlet.ParameterSetName -notlike '*All') {
         $dockerImagesToScan = ''
         # print local image names
         # used only with the -Build
@@ -751,6 +787,52 @@ End {
         }
     }
 
+    $channelsUsed = @{}
+    $releaseChannelsUsed = @{}
+    $imgsMetadata = @{}
+    $emptyArr = @()
+    if ($UpdateImageMetadata.IsPresent) {
+        foreach ($repo in $tagGroups.Keys | Sort-Object) {
+            $channelGroups = $tagGroups.$repo | Group-Object -Property Channel
+            foreach($channelGroup in $channelGroups)
+            {
+                $channelName = $channelGroup.Name
+                if (!$releaseChannelsUsed.Contains($channelName))
+                {
+                    $releaseChannelsUsed.Add($channelName, $emptyArr)
+                }
+
+                $osGroups = $channelGroup.Group | Group-Object -Property os
+                foreach ($osGroup in $osGroups) {
+                    $architectureGroups = $osGroup.Group | Group-Object -Property Architecture
+                    foreach ($architectureGroup in $architectureGroups) {
+                        foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
+
+                            # for release yaml, need to collect tag object (containing metadata for each image)
+                            $releaseChannelsUsed[$channelName] += $tag
+                        }
+                    }
+                }
+            }
+        }
+
+        $channelsFound = $releaseChannelsUsed.Keys
+        foreach ($channelKey in $channelsFound)
+        {
+            $imgInfoObjArr = $releaseChannelsUsed[$channelKey]
+            $metadataValuesArr = Get-ImgMetadataByChannel -Channel $channelName -ImageInfoObjects $imgInfoObjArr
+            $imgsMetadata.Add($channelName, $metadataValuesArr)
+        }
+
+        $metadataJsonFileExists = Test-Path -Path $MetadataFilePath
+        if ($metadataJsonFileExists)
+        {
+            Remove-Item -Path $MetadataFilePath
+        }
+
+        $imgsMetadata | ConvertTo-Json | Out-File $MetadataFilePath
+    }
+
     if ($GenerateManifestLists.IsPresent) {
         $manifestLists = @()
         $tags = @()
diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1
index 5e5da6781..d114d4a29 100644
--- a/tests/container.tests.ps1
+++ b/tests/container.tests.ps1
@@ -165,8 +165,829 @@ Describe "Pull Windows Containers" -Tags 'Windows', 'Pull' {
     }
 }
 
-Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
+Describe "Load Linux Containers" -Tags 'Linux', 'Load' {
+    BeforeAll {
+        # Get all files for loading:
+        if ($env:LOAD_PATH -eq $null)
+        {
+            throw "Load path was not set"
+        }
+
+        $pathToImgFolder = $env:LOAD_PATH
+        $pathToImgFolderExists = Test-Path -Path $pathToImgFolder
+        if (!$pathToImgFolderExists)
+        {
+            throw "Load path folder does not exist"
+        }
+
+        $distroFolder = Get-Item -Path $pathToImgFolder
+        $distroName = $distroFolder.Name
+        $imageFolderOnTestDrivePath = Join-Path -Path $TestDrive -ChildPath 'images'
+        New-Item -Path $imageFolderOnTestDrivePath -ItemType Directory
+        Copy-Item -Path $pathToImgFolder -Destination $imageFolderOnTestDrivePath -Recurse
+
+        $pathToDistroFolder = Join-Path -Path $imageFolderOnTestDrivePath -ChildPath $distroName
+
+        $loadTestCases = @()
+        foreach ($testObj in $script:linuxContainerRunTests)
+        {
+            $parentFolderPath = $testObj.LoadPathParentFolder
+            $shortImageName = $testObj.ShortImageName
+            $tarFileName = "$shortImageName.tar"
+
+            $filePath = Join-Path -Path $parentFolderPath -ChildPath $tarFileName
+            $fullFilePath = Join-Path -Path $pathToDistroFolder -ChildPath $filePath
+            $pathExistsInLoadPath = Test-Path -Path $fullFilePath
+            if ($pathExistsInLoadPath)
+            {
+                $loadTestCases += @{LoadPath = $fullFilePath; NewName = $shortImageName; NewTag = $parentFolderPath}
+            }
+        }
+    }
+
+    it ".tar file located at: <LoadPath> with <NewName>:<NewTag> loads without error" -TestCases $loadTestCases -Skip:$script:skipLinuxRun {
+        param(
+            [Parameter(Mandatory=$true)]
+            [string]
+            $LoadPath,
+
+            [Parameter(Mandatory=$true)]
+            [string]
+            $NewName,
+
+            [Parameter(Mandatory=$true)]
+            [string]
+            $NewTag
+        )
+
+        $result = Invoke-Docker -Command load -Params @(
+            "-i", "$LoadPath"
+        ) -PassThru
+
+        $loadedImgParts = $result.Split("Loaded image: ", [System.StringSplitOptions]::RemoveEmptyEntries)
+        $loadedImgNameAndTag = ""
+        if ($loadedImgParts.Count -ge 0)
+        {
+            $loadedImgNameAndTag = $loadedImgParts[0]
+        }
+
+        $newNameAndTagValue = $NewName + ":" + $NewTag
+        $renameResult = Invoke-Docker -Command tag -Params @(
+            $loadedImgNameAndTag, $newNameAndTagValue
+        ) -PassThru
+
+        $removeOldResult = Invoke-Docker -Command rmi -Params @(
+            $loadedImgNameAndTag
+        ) -PassThru
+    }
+}
+
+
+Describe "Load Windows Containers" -Tags 'Windows', 'Load' {
+    BeforeAll {
+        # Get all files for loading:
+        if ($env:LOAD_PATH -eq $null)
+        {
+            throw "Load path was not set"
+        }
+
+        $pathToImgFolder = $env:LOAD_PATH
+        $pathToImgFolderExists = Test-Path -Path $pathToImgFolder
+        if (!$pathToImgFolderExists)
+        {
+            throw "Load path folder does not exist"
+        }
+
+        $distroFolder = Get-Item -Path $pathToImgFolder
+        $distroName = $distroFolder.Name
+        $imageFolderOnTestDrivePath = Join-Path -Path $TestDrive -ChildPath 'images'
+        New-Item -Path $imageFolderOnTestDrivePath -ItemType Directory
+        Copy-Item -Path $pathToImgFolder -Destination $imageFolderOnTestDrivePath -Recurse
+        $pathToDistroFolder = Join-Path -Path $imageFolderOnTestDrivePath -ChildPath $distroName
+
+        $windowsLoadTestCases = @()
+        foreach ($testObj in $script:windowsContainerRunTests)
+        {
+            $parentFolderPath = $testObj.LoadPathParentFolder
+            $shortImageName = $testObj.ShortImageName
+            $tarFileName = "$shortImageName.tar"
+
+            $filePath = Join-Path -Path $parentFolderPath -ChildPath $tarFileName
+            $fullFilePath = Join-Path -Path $pathToDistroFolder -ChildPath $filePath
+            $pathExistsInLoadPath = Test-Path -Path $fullFilePath
+            if ($pathExistsInLoadPath)
+            {
+                $windowsLoadTestCases += @{LoadPath = $fullFilePath; NewName = $shortImageName; NewTag = $parentFolderPath}
+            }
+        }
+
+        $script:SkipWindowsLoad = $windowsLoadTestCases.Count -eq 0 
+    }
+
+    it ".tar file located at: <Path> with <NewName>:<NewTag> loads without error" -TestCases $windowsLoadTestCases -skip:$script:SkipWindowsLoad {
+        param(
+            [Parameter(Mandatory=$true)]
+            [string]
+            $LoadPath,
+
+            [Parameter(Mandatory=$true)]
+            [string]
+            $NewName,
+
+            [Parameter(Mandatory=$true)]
+            [string]
+            $NewTag
+        )
+
+        $result = Invoke-Docker -Command load -Params @(
+            "-i", "$LoadPath"
+        ) -PassThru
+
+        $loadedImgParts = $result.Split("Loaded image: ", [System.StringSplitOptions]::RemoveEmptyEntries)
+        $loadedImgNameAndTag = ""
+        if ($loadedImgParts.Count -ge 0)
+        {
+            $loadedImgNameAndTag = $loadedImgParts[0]
+        }
+
+        $newNameAndTagValue = $NewName + ":" + $NewTag
+        $renameResult = Invoke-Docker -Command tag -Params @(
+            $loadedImgNameAndTag, $newNameAndTagValue
+        ) -PassThru
+
+        $removeOldResult = Invoke-Docker -Command rmi -Params @(
+            $loadedImgNameAndTag
+        ) -PassThru
+    }
+}
+
+
+Describe "Linux Containers" -Tags 'LoadBehavior', 'Linux' {
+    BeforeAll{
+        $testContext = Get-TestContext -type Linux
+        $loadedRunTestCases = @()
+        $webTestCases = @()
+        $gssNtlmSspTestCases = @()
+
+        foreach ($testObj in $script:linuxContainerRunTests)
+        {
+            $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+            $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+            $arm32 = [bool] $testObj.TestProperties.Arm32
+            $loadedRunTestCases += @{
+                Name = $shortName
+                LoadedImageName = $loadedImageNameAndTag
+                ExpectedVersion = $testObj.ExpectedVersion
+                Channel = $testObj.Channel
+                Arm32 = $arm32
+            }
+
+            if ($testObj.SkipWebCmdletTests -ne $true)
+            {
+                $webTestCases += @{
+                    Name = $shortName
+                    LoadedImageName = $loadedImageNameAndTag
+                    Arm32 = $arm32
+                }
+            }
+
+            if ($testObj.SkipGssNtlmSspTests -ne $true)
+            {
+                $gssNtlmSspTestCases += @{
+                    Name = $shortName
+                    LoadedImageName = $loadedImageNameAndTag
+                    Arm32 = $arm32 
+                }
+            }
+        }
+    }
+    AfterAll {
+        # prune unused volumes
+        $null=Invoke-Docker -Command 'volume', 'prune' -Params '--force' -SuppressHostOutput
+    }
+    BeforeEach {
+        Remove-Item $testContext.resolvedXmlPath -ErrorAction SilentlyContinue
+        Remove-Item $testContext.resolvedLogPath -ErrorAction SilentlyContinue
+    }
+
+    Context "Run Powershell" {
+        it "PSVersion table from <Name> should contain <ExpectedVersion>" -TestCases $loadedRunTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $ExpectedVersion,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32
+            )
+
+            if ($Arm32) {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $actualVersion = Get-ContainerPowerShellVersion -TestContext $testContext -Name $LoadedImageName
+            $actualVersion | should -be $ExpectedVersion
+        }
+
+        it "Invoke-WebRequest from <Name> should not fail" -TestCases $webTestCases -Skip:($script:skipLinuxRun -or $webTestCases.count -eq 0) {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,                
+
+                [Bool]
+                $Arm32
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $metadataString = Get-MetadataUsingContainer -Name $LoadedImageName
+            try {
+                $metadataString | Should -Not -BeNullOrEmpty
+                $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
+                $metadataJson | Select-Object -ExpandProperty StableReleaseTag | Should -Match '^v\d+\.\d+\.\d+.*$'
+            } catch {
+                Write-Verbose $metadataString -Verbose
+                throw
+            }
+        }
+
+        it "Get-UICulture from <Name> should return en-US" -TestCases $loadedRunTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $ExpectedVersion,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $culture = Get-UICultureUsingContainer -Name $LoadedImageName
+            $culture | Should -Not -BeNullOrEmpty
+            $culture | Should -BeExactly 'en-US'
+        }
+
+        it "gss-ntlmssp is installed in <Name>" -TestCases $gssNtlmSspTestCases -Skip:($script:skipLinuxRun -or $gssNtlmSspTestCases.count -eq 0) {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Bool]
+                $Arm32
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $gssNtlmSspPath = Get-LinuxGssNtlmSsp -Name $LoadedImageName
+            $gssNtlmSspPath | Should -Not -BeNullOrEmpty
+        }
+
+        it "Has POWERSHELL_DISTRIBUTION_CHANNEL environment variable defined" -TestCases $loadedRunTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $ExpectedVersion,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $psDistChannel = Get-PowerShellDistibutionChannel -TestContext $testContext -Name $LoadedImageName
+            $psDistChannel | Should -BeLike "PSDocker-*"
+        }
+    }
+
+    Context "permissions" {
+        BeforeAll {
+            $permissionsTestCases = @()
+            foreach ($testObj in $script:linuxContainerRunTests)
+            {
+                $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+                $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+                $arm32 = [bool] $testObj.TestProperties.Arm32
+
+                $path = '/opt/microsoft/powershell/6/pwsh'
+                $pwshInstallFolder = Get-PwshInstallVersion -Channel $testObj.Channel
+                $path = "/opt/microsoft/powershell/$pwshInstallFolder/pwsh"
+
+                $permissionsTestCases += @{
+                    Name = $shortName
+                    LoadedImageName = $loadedImageNameAndTag
+                    Channel = $testObj.Channel
+                    Arm32 = $arm32
+                    Path = $path
+                }
+            }            
+        }
+
+        it "pwsh should be at <Path> in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32,
+
+                [string]
+                $Path
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is flaky on QEMU"
+            }
+
+            $paths = @(Get-DockerCommandSource -Name $LoadedImageName -Command 'pwsh')
+            $paths.count | Should -BeGreaterOrEqual 1
+            $pwshPath = $paths | Where-Object { $_ -like '*microsoft*' }
+            $pwshPath | Should -Be $Path
+        }
+
+        it "pwsh should have execute permissions for all in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32,
+
+                [string]
+                $Path
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $permissions = Get-DockerImagePwshPermissions -Name $LoadedImageName -Path $path
+            $permissions | Should -Match '^[\-rw]{3}x([\-rw]{2}x){2}$' -Because 'Everyone should be able to execute'
+        }
+
+        it "pwsh should NOT have write permissions for others in <channel>-<Name>" -TestCases $permissionsTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [string]
+                $Channel,
+
+                [Bool]
+                $Arm32,
+
+                [string]
+                $Path
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $permissions = Get-DockerImagePwshPermissions -Name $LoadedImageName -Path $path
+            $permissions | Should -Match '^[\-rwx]{4}[\-rwx]{3}[\-rx]{3}$' -Because 'Others should not be able to write'
+        }
+    }
+
+    Context "default executables" {
+        BeforeAll {
+            #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps
+            $commands = @(
+                #'locale-gen'
+                # debian 'update-ca-certificates'
+                'less'
+            )
+
+            $testdepsTestCases = @()
+            foreach ($testObj in $script:linuxContainerRunTests)
+            {
+                $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+                $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+                $arm32 = [bool] $testObj.TestProperties.Arm32
+                foreach ($command in $commands)
+                {
+                    $testdepsTestCases += @{
+                        Name = $shortName
+                        LoadedImageName = $loadedImageNameAndTag
+                        Command = $command
+                        Arm32 = $arm32
+                    }
+                }
+            }
+        }
+
+        it "<Name> should have <command>" -TestCases $testdepsTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Command,
+
+                [Bool]
+                $Arm32
+            )
+
+            if($Arm32)
+            {
+                Set-ItResult -Pending -Because "Arm32 is falky on QEMU"
+            }
+
+            $source = Get-DockerCommandSource -Name $LoadedImageName -command $Command
+            $source | Should -Not -BeNullOrEmpty
+        }
+    }
+
+    Context "test-deps" {
+        BeforeAll{
+            #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps
+            $commands = @(
+                #@{command = 'adduser'}
+                @{command = 'bash'}
+                @{command = 'curl'}
+                @{command = 'find'}
+                @{command = 'git'}
+                @{command = 'hostname'}
+                @{command = 'openssl'}
+                @{command = 'ping'}
+                @{command = 'ps'}
+                @{command = 'su'}
+                @{command = 'sudo'}
+                @{command = 'tar'}
+                @{command = 'gzip'}
+                @{command = 'unzip'}
+                @{command = 'wget'}
+            )
+
+            $debianCommands = @(
+                @{command = 'apt'}
+                @{command = 'apt-get'}
+            )
+
+            $muslCommands = @(
+                @{
+                    command = 'node'
+                }
+            )
+
+            $testdepsTestCases = @()
+            foreach ($testObj in $script:linuxContainerRunTests)
+            {
+                $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+                $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+
+                if ($testObj.OptionalTests -contains 'test-deps')
+                {
+                    foreach($command in $commands)
+                    {
+                        $testdepsTestCases += @{
+                            Name = $shortName
+                            LoadedImageName = $loadedImageNameAndTag
+                            Command = $command.command
+                            ExpectedPath = $command.Path
+                        }
+                    }
+                }
+
+                if ($testObj.OptionalTests -contains 'test-deps-debian')
+                {
+                    foreach($command in $debianCommands)
+                    {
+                        $testdepsTestCases += @{
+                            Name = $shortName
+                            LoadedImageName = $loadedImageNameAndTag
+                            Command = $command.command
+                            ExpectedPath = $command.Path
+                        }
+                    }
+                }
+
+                if ($testObj.OptionalTests -contains 'test-deps-musl')
+                {
+                    foreach($command in $muslCommands)
+                    {
+                        $testdepsTestCases += @{
+                            Name = $shortName
+                            LoadedImageName = $loadedImageNameAndTag
+                            Command = $command.command
+                            ExpectedPath = $command.Path
+                        }
+                    }
+                }
+            }
+
+            $skipTestDeps = $testdepsTestCases.count -eq 0
+        }
+
+        it "<Name> should have <Command>" -TestCases $testdepsTestCases -Skip:$skipTestDeps {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Command,
+
+                [string]
+                $ExpectedPath
+            )
+
+            $source = Get-DockerCommandSource -Name $LoadedImageName -command $Command
+            $source | Should -Not -BeNullOrEmpty -Because "$Command should be found"
+            if($ExpectedPath)
+            {
+                $source | Should -BeExactly $ExpectedPath  -Because "$Command should be at $ExpectedPath"
+            }
+        }
+    }
+
+    Context "Size" {
+        BeforeAll {
+            $sizeTestCases = @()
+            foreach ($testObj in $script:linuxContainerRunTests)
+            {
+                $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+                $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+                $size = $testObj.TestProperties.size
+
+                $sizeTestCases += @{
+                    Name = $shortName
+                    LoadedImageName = $loadedImageNameAndTag
+                    ExpectedSize = $size
+                }
+            }
+        }
+
+        it "Verify size of <name>" -TestCases $sizeTestCases -Skip:$script:skipLinuxRun {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+                
+                [int]$ExpectedSize
+            )
+
+            if ($env:DOCKER_RELEASE) {
+                Set-ItResult -Skipped -Because "Test only used in CI"
+            }
+
+            $sizeMb = Get-DockerImageSize -name $LoadedImageName
+            Write-Verbose "image is $sizeMb MiB" -Verbose
+            if($ExpectedSize -and !$env:RELEASE_DEFINITIONID)
+            {
+                # allow for a 5% increase without an error
+                $sizeMb | Should -BeLessOrEqual ($ExpectedSize * 1.05) -Because "$name is set to be $ExpectedSize in meta.json"
+            }
+        }
+    }
+}
+
+Describe "Windows Containers" -Tags 'LoadBehavior', 'Windows' {
     BeforeAll{
+        $testContext = Get-TestContext -type Windows
+        $windowsLoadedRunTestCases = @()
+        $webTestCases = @()
+
+        foreach ($testObj in $script:windowsContainerRunTests)
+        {
+            $loadedImageNameAndTag = "$($testObj.ShortImageName):$($testObj.LoadPathParentFolder)"
+            $shortName = $($testObj.LoadPathParentFolder) -eq "main" ? $($testObj.ShortImageName) : "$($testObj.ShortImageName)/$($testObj.LoadPathParentFolder)"
+            $windowsLoadedRunTestCases += @{
+                Name = $shortName
+                LoadedImageName = $loadedImageNameAndTag
+                ExpectedVersion = $testObj.ExpectedVersion
+                Channel = $testObj.Channel
+                UseAcr = [bool]$testObj.UseAcr
+            }
+
+            if ($testObj.SkipWebCmdletTests -ne $true)
+            {
+                $webTestCases += @{
+                    Name = $shortName
+                    LoadedImageName = $loadedImageNameAndTag
+                    UseAcr = [bool]$testObj.UseAcr
+                }
+            }
+        }
+
+        $script:SkipWindowsLoadBehavior = $windowsLoadedRunTestCases.Count -eq 0 
+    }
+    BeforeEach {
+        Remove-Item $testContext.resolvedXmlPath -ErrorAction SilentlyContinue
+        Remove-Item $testContext.resolvedLogPath -ErrorAction SilentlyContinue
+    }
+
+    Context "Run Powershell" {
+        it "Get PSVersion table from <Name> should be <ExpectedVersion>" -TestCases $windowsLoadedRunTestCases -skip:$script:SkipWindowsLoadBehavior {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $ExpectedVersion,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Channel,
+
+                [Bool]
+                $UseAcr
+            )
+
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
+            Get-ContainerPowerShellVersion -TestContext $testContext -Name $LoadedImageName | should -be $ExpectedVersion
+        }
+
+        it "Invoke-WebRequest from <Name> should not fail" -TestCases $webTestCases -skip:$script:SkipWindowsLoadBehavior {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Bool]
+                $UseAcr
+            )
+
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
+            $metadataString = Get-MetadataUsingContainer -Name $LoadedImageName
+            $metadataString | Should -Not -BeNullOrEmpty
+            $metadataJson = $metadataString | ConvertFrom-Json -ErrorAction Stop
+            $metadataJson | Select-Object -ExpandProperty StableReleaseTag | Should -Match '^v\d+\.\d+\.\d+.*$'
+        }
+
+        it "Path of <Name> should match the base container" -TestCases $webTestCases -skip:$script:SkipWindowsLoadBehavior {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Bool]
+                $UseAcr
+            )
+
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
+            $path = Get-ContainerPath -Name $LoadedImageName
+
+            #TODO: Run the base image and make sure the path is included
+
+            $path | should -Match ([System.Text.RegularExpressions.Regex]::Escape("C:\Windows\system32"))
+        }
+
+        it "Has POWERSHELL_DISTRIBUTION_CHANNEL environment variable defined" -TestCases $windowsLoadedRunTestCases -Skip:$script:SkipWindowsLoadBehavior {
+            param(
+                [Parameter(Mandatory=$true)]
+                [string]
+                $name,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $LoadedImageName,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $ExpectedVersion,
+
+                [Parameter(Mandatory=$true)]
+                [string]
+                $Channel,
+
+                [Bool]
+                $UseAcr
+            )
+
+            if ($UseAcr) {
+                Set-ItResult -Pending -Because "Images that use ACR can't be tested"
+            }
+
+            $psDistChannel = Get-PowerShellDistibutionChannel -TestContext $testContext -Name $LoadedImageName
+            $psDistChannel | Should -BeLike "PSDocker-*"
+        }
+    }
+}
+
+
+Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
+    BeforeAll {
         $testContext = Get-TestContext -type Linux
         $runTestCases = @()
         $script:linuxContainerRunTests | ForEach-Object {
diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1
index 71ccd29f8..37ae4b315 100644
--- a/tests/containerTestCommon.psm1
+++ b/tests/containerTestCommon.psm1
@@ -127,7 +127,7 @@ function Get-LinuxContainer
         # Only return results where:
         # OS eq linux
         # not (purpose eq verification -and SkipVerification)
-        if($testArgs.os -eq 'linux' -and !($Purpose -eq 'Verification' -and $testArgs.SkipVerification))
+        if($testArgs.os -eq 'linux' -and !($Purpose -eq 'Verification' -and $testArgs.SkipVerification) -and $testArgs.LoadPathParentFolder -eq "main")
         {
             $skipPull = ![string]::IsNullOrEmpty($testArgs.BaseImage)
             Write-Output @{
@@ -144,6 +144,8 @@ function Get-LinuxContainer
                 TestProperties = $testArgs.TestProperties
                 Channel = $testArgs.Channel
                 UseAcr = $testArgs.UseAcr
+                LoadPathParentFolder = $testArgs.LoadPathParentFolder
+                ShortImageName = $testArgs.ShortImageName
             }
         }
     }
@@ -164,7 +166,7 @@ function Get-WindowsContainer
 
     foreach($testArgs in $testArgsList)
     {
-        if($testArgs.os -eq 'windows' -and !($Purpose -eq 'Verification' -and $testArgs.SkipVerification))
+        if($testArgs.os -eq 'windows' -and !($Purpose -eq 'Verification' -and $testArgs.SkipVerification) -and $testArgs.LoadPathParentFolder -eq "main")
         {
             $skipPull = ![string]::IsNullOrEmpty($testArgs.BaseImage)
             Write-Output @{
@@ -181,6 +183,8 @@ function Get-WindowsContainer
                 TestProperties = $testArgs.TestProperties
                 Channel = $testArgs.Channel
                 UseAcr = $testArgs.UseAcr
+                LoadPathParentFolder = $testArgs.LoadPathParentFolder
+                ShortImageName = $testArgs.ShortImageName
             }
         }
     }
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 6776dd308..69c6f7038 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -680,6 +680,8 @@ class DockerTestArgs
     [PSCustomObject] $TestProperties
     [string] $Channel
     [bool] $UseAcr
+    [string] $LoadPathParentFolder
+    [string] $ShortImageName
 }
 
 function Get-TestParams
@@ -724,6 +726,20 @@ function Get-TestParams
         $skipVerification = $true
     }
 
+    $loadPathParent = "" # will be "main" or "test" folder name
+    $imageName = "" # also capture image name (without test-deps part) as it may be needed for load tests to derive <imageName>.tar file name
+    if ($dockerFileName.Contains("test-deps"))
+    {
+        $loadPathParent = "test"
+        $dockerFileParts = $dockerFileName.Split("test-deps", [System.StringSplitOptions]::RemoveEmptyEntries)
+        $imageName = $dockerFileParts[0].TrimEnd("\","/")
+    }
+    else
+    {
+        $loadPathParent = "main"
+        $imageName = $dockerFileName
+    }
+
     # for the image name label, always use the official image name
     $imageNameParam = "mcr.microsoft.com/$($allMeta.FullRepository):" + $actualTagData.TagList[0]
     if($actualChannel -like 'community-*')
@@ -801,6 +817,8 @@ function Get-TestParams
         TestProperties = $allMeta.meta.TestProperties
         Channel = $actualChannel
         UseAcr = $allMeta.meta.UseAcr
+        LoadPathParentFolder = $loadPathParent
+        ShortImageName = $imageName #instead of the official image name (like mcr.microsoft.com/*) just alpine316 for example
     }
 
     return [DockerTestParams] @{
@@ -1100,13 +1118,14 @@ function Invoke-PesterWrapper {
 
     Write-Verbose "Launching pester with $($ExtraParams|Out-String)" -Verbose
 
-    if(!(Get-Module -ListAvailable pester -ErrorAction Ignore) -or $ForcePesterInstall.IsPresent)
+    Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted
+    if(!(Get-Module "pester" -ListAvailable -ErrorAction Ignore | Where-Object {$_.Version -le "4.99" -and $_.Version -gt "4.00"}) -or $ForcePesterInstall.IsPresent)
     {
-        Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
+        Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99 -Repository PSGallery -SkipPublisherCheck -Verbose
     }
 
     Remove-Module Pester -Force -ErrorAction SilentlyContinue
-    Import-Module pester -MaximumVersion 4.99 -Scope Global
+    Import-Module pester -MaximumVersion 4.99 -Scope Global -Verbose
 
     Write-Verbose -Message "logging to $OutputFile" -Verbose
     $results = $null
@@ -1244,3 +1263,33 @@ function Get-TemplatePopulatedYaml {
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)channel: `${{ parameters.channel }}"
     Add-Content -Path $YamlFilePath -Value "$($sixSpace)channelPath: `${{ parameters.channelPath }}"
 }
+
+function Get-ImgMetadataByChannel {
+    param(
+        [string]
+        $Channel,
+
+        [string]
+        $FilePath,
+
+        [object[]]
+        $ImageInfoObjects
+    )
+
+    $imgsForChannelArr = @()
+    foreach ($img in $ImageInfoObjects)
+    {
+        $imgName = $img.Name
+        $tags = $img.Tags
+
+        $tagStr = $tags -join " "
+        $imgOS = $img.IsLinux ? "linux" : "windows"
+        $imgMeta = @{}
+        $imgMeta.Add("name", $imgName)
+        $imgMeta.Add("tags", $tagStr)
+        $imgMeta.Add("os", $imgOS)
+        $imgsForChannelArr += $imgMeta
+    }
+
+    return $imgsForChannelArr
+}

From 6460bbb62066945fc55ab4c359681af5fd285e70 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 12 Sep 2024 11:56:57 -0400
Subject: [PATCH 334/354] increase size for ubi8 for preview (#825)

---
 release/7-5/ubi8/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/7-5/ubi8/meta.json b/release/7-5/ubi8/meta.json
index 9639070ce..bc5a6587c 100644
--- a/release/7-5/ubi8/meta.json
+++ b/release/7-5/ubi8/meta.json
@@ -10,7 +10,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 625
+        "size": 700
     },
     "DistributionState": "Validating",
     "EndOfLife": "2023-05-30"

From ed13cb978a53a1dcaf95c4c6f348cd07535ebe08 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 17 Sep 2024 13:29:23 -0400
Subject: [PATCH 335/354] Update preview mariner2-arm64 image to use aarch rpm
 and dotnet 9.0 (#827)

* update preview mariner2-arm64 image to use aarch rpm and dotnet 9.0

* fix typo in PACKAGE_VERSION arg

* fix package naming to reflect preview
---
 release/7-5/mariner2-arm64/docker/Dockerfile | 110 ++++++++++++-------
 release/7-5/mariner2-arm64/meta.json         |   2 +-
 2 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/release/7-5/mariner2-arm64/docker/Dockerfile b/release/7-5/mariner2-arm64/docker/Dockerfile
index 23e28acd1..6f3b3e346 100644
--- a/release/7-5/mariner2-arm64/docker/Dockerfile
+++ b/release/7-5/mariner2-arm64/docker/Dockerfile
@@ -1,49 +1,48 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
 
     # Define Args for the needed to add the package
-    ARG PS_VERSION=7.4.0-rc.1
-    ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-arm64.tar.gz
+    ARG PS_VERSION=7.5.0-preview.4
+    ARG PACKAGE_VERSION=7.5.0_preview.4
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.aarch64.rpm
     ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
     ARG PS_INSTALL_VERSION=7-preview
 
-    # Define the folder we will be installing PowerShell to.
-    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
-
-    # Create the install folder.
-    RUN mkdir -p ${PS_INSTALL_FOLDER}
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
 
-    ARG PS_PACKAGE_URL_BASE64
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
 
     RUN --mount=type=cache,target=/var/cache/tdnf \
-        tdnf update -y \
-        && tdnf install -y ca-certificates wget tar
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
 
-    RUN echo 'in task' \
-        && if [ -n "${PS_PACKAGE_URL_BASE64}" ];  then \
-            echo 'using base64' \
-            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -); \
-        else \
-            echo 'using unencoded' \
-            && export url="${PS_PACKAGE_URL}"; \
-        fi \
-        && echo "url: $url" \
-        && wget -O /tmp/powershell.tar.gz "$url" \
-        && echo 'task done'
+    RUN echo ${PS_PACKAGE_URL}
 
-    RUN ls -l /tmp/powershell.tar.gz
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
 
-    # Unzip the linux powershell.tar.gz
-    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
-
-FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final-image
-
-    # Define Args and Env needed to create links
+    ARG PS_VERSION=7.5.0-preview.4
     ARG PS_INSTALL_VERSION=7-preview
-    ARG PS_VERSION=7.4.0-rc.1
 
+    # Define Args and Env needed to create links
     ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
         \
         # Define ENVs for Localization/Globalization
@@ -54,20 +53,47 @@ FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final
         PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
         POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
 
-    # Copy only the files we need from the previous stage
-    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-        tdnf update -y \
-        && tdnf install -y icu less openssh-clients ca-certificates dotnet-runtime-7.0 \
-        && tdnf upgrade -y \
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
         && tdnf clean all
 
-        # Give all user execute permissions and remove write permissions for others
-    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-        # Create the pwsh symbolic link that points to powershell
-        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
 
     # Use PowerShell as the default shell
     # Use array to avoid Docker prepending /bin/sh -c
diff --git a/release/7-5/mariner2-arm64/meta.json b/release/7-5/mariner2-arm64/meta.json
index 7c0fd8cfc..973e673ab 100644
--- a/release/7-5/mariner2-arm64/meta.json
+++ b/release/7-5/mariner2-arm64/meta.json
@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-arm64.tar.gz",
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
     "osVersion": "Mariner 2.0 ARM 64v7",
     "SkipGssNtlmSspTests": true,
     "ShortDistroName": "mariner",

From 00d8b773066f366dcda602862945c5e843cd6873 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 8 Oct 2024 19:03:10 -0400
Subject: [PATCH 336/354] Add support for Azurelinux3.0 (#829)

* initial commit for azurelinux 3.0 support

* add docker images for azure linux 3.0 and azure linux 3.0 arm64

* fix shortDistroName for azurelinux3-arm64

* update PSVersion

* use aarch rpm package and get latest dotnet version

* add 7-4 images for azurelinux3 and azurelinux3-arm64

* 7-4 images should use stable package url
---
 .../7-4/azurelinux3-arm64/docker/Dockerfile   |  90 ++++++++++++++++
 release/7-4/azurelinux3-arm64/meta.json       |  19 ++++
 release/7-4/azurelinux3/docker/Dockerfile     |  91 ++++++++++++++++
 release/7-4/azurelinux3/meta.json             |  15 +++
 .../7-5/azurelinux3-arm64/docker/Dockerfile   | 100 +++++++++++++++++
 release/7-5/azurelinux3-arm64/meta.json       |  19 ++++
 release/7-5/azurelinux3/docker/Dockerfile     | 101 ++++++++++++++++++
 release/7-5/azurelinux3/meta.json             |  15 +++
 8 files changed, 450 insertions(+)
 create mode 100644 release/7-4/azurelinux3-arm64/docker/Dockerfile
 create mode 100644 release/7-4/azurelinux3-arm64/meta.json
 create mode 100644 release/7-4/azurelinux3/docker/Dockerfile
 create mode 100644 release/7-4/azurelinux3/meta.json
 create mode 100644 release/7-5/azurelinux3-arm64/docker/Dockerfile
 create mode 100644 release/7-5/azurelinux3-arm64/meta.json
 create mode 100644 release/7-5/azurelinux3/docker/Dockerfile
 create mode 100644 release/7-5/azurelinux3/meta.json

diff --git a/release/7-4/azurelinux3-arm64/docker/Dockerfile b/release/7-4/azurelinux3-arm64/docker/Dockerfile
new file mode 100644
index 000000000..82a4633ed
--- /dev/null
+++ b/release/7-4/azurelinux3-arm64/docker/Dockerfile
@@ -0,0 +1,90 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm64 mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.4.5
+    ARG PACKAGE_VERSION=7.4.5
+    ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.cm.aarch64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.4.5
+    ARG PS_INSTALL_VERSION=7
+
+    # Define Args and Env needed to create links
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AzureLinux-3.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        dotnet-runtime-8.0 \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7/pwsh" ]; then ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-4/azurelinux3-arm64/meta.json b/release/7-4/azurelinux3-arm64/meta.json
new file mode 100644
index 000000000..38bb0eed0
--- /dev/null
+++ b/release/7-4/azurelinux3-arm64/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-1.cm.aarch64.rpm",
+    "osVersion": "Azure Linux 3.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "azurelinux",
+    "shortTags": [
+        {"Tag": "3.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "Arm32": true
+    },
+    "EndOfLife": "2025-12-14",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}
diff --git a/release/7-4/azurelinux3/docker/Dockerfile b/release/7-4/azurelinux3/docker/Dockerfile
new file mode 100644
index 000000000..9304c3777
--- /dev/null
+++ b/release/7-4/azurelinux3/docker/Dockerfile
@@ -0,0 +1,91 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    # Use the cache mount since this image does go into the final product
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.4.5
+    ARG PACKAGE_VERSION=7.4.5
+    ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.4.0
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AzureLinux-3.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        dotnet-runtime-8.0 \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7/pwsh" ]; then ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-4/azurelinux3/meta.json b/release/7-4/azurelinux3/meta.json
new file mode 100644
index 000000000..0944fe03d
--- /dev/null
+++ b/release/7-4/azurelinux3/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Azure Linux 3.0",
+    "shortTags": [
+        {"Tag": "3.0"}
+    ],
+    "ShortDistroName": "azurelinux",
+    "TestProperties": {
+        "size": 335
+    },
+    "EndOfLife": "2025-10-14",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-5/azurelinux3-arm64/docker/Dockerfile b/release/7-5/azurelinux3-arm64/docker/Dockerfile
new file mode 100644
index 000000000..140174999
--- /dev/null
+++ b/release/7-5/azurelinux3-arm64/docker/Dockerfile
@@ -0,0 +1,100 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm64 mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PACKAGE_VERSION=7.5.0_preview.5
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.aarch64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-AzureLinux-3
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-5/azurelinux3-arm64/meta.json b/release/7-5/azurelinux3-arm64/meta.json
new file mode 100644
index 000000000..a71096ca2
--- /dev/null
+++ b/release/7-5/azurelinux3-arm64/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
+    "osVersion": "Azure Linux 3.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "azurelinux",
+    "shortTags": [
+        {"Tag": "3.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "Arm32": true
+    },
+    "EndOfLife": "2025-12-14",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}
diff --git a/release/7-5/azurelinux3/docker/Dockerfile b/release/7-5/azurelinux3/docker/Dockerfile
new file mode 100644
index 000000000..2eae2ee31
--- /dev/null
+++ b/release/7-5/azurelinux3/docker/Dockerfile
@@ -0,0 +1,101 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    # Use the cache mount since this image does go into the final product
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PACKAGE_VERSION=7.5.0_preview.5
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+        wget \
+        awk \
+        tar \
+        ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.5.0-preview.5
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AzureLinux-3.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-5/azurelinux3/meta.json b/release/7-5/azurelinux3/meta.json
new file mode 100644
index 000000000..a47740aa7
--- /dev/null
+++ b/release/7-5/azurelinux3/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "AzureLinux 3.0",
+    "shortTags": [
+        {"Tag": "3.0"}
+    ],
+    "ShortDistroName": "azurelinux",
+    "TestProperties": {
+        "size": 335
+    },
+    "EndOfLife": "2026-01-14",
+    "DistributionState": "Validating"
+}

From 68ff6c74be304bbf20f53acca839841f8fbe844e Mon Sep 17 00:00:00 2001
From: Chongyi Zheng <git@zcy.dev>
Date: Wed, 9 Oct 2024 12:55:25 -0400
Subject: [PATCH 337/354] Add alpine 3.18 and 3.19 images for PowerShell
 7.4/7.5 (#796)

* Add alpine 3.18 and 3.19 for PowerShell 7.5

* Use libssl3 instead of libssl1.1 in alpine 3.19

* Add alpine 3.18 and 3.19 for powershell 7.4

* Update release/7-5/alpine319/docker/Dockerfile

* Update release/7-5/alpine318/docker/Dockerfile

* Update release/7-4/alpine319/docker/Dockerfile

* Update release/7-4/alpine318/docker/Dockerfile

---------

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
---
 release/7-4/alpine318/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-4/alpine318/meta.json               | 21 +++++
 .../7-4/alpine318/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-4/alpine318/test-deps/meta.json     | 16 ++++
 release/7-4/alpine319/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-4/alpine319/meta.json               | 21 +++++
 .../7-4/alpine319/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-4/alpine319/test-deps/meta.json     | 16 ++++
 release/7-5/alpine318/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-5/alpine318/meta.json               | 21 +++++
 .../7-5/alpine318/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-5/alpine318/test-deps/meta.json     | 16 ++++
 release/7-5/alpine319/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-5/alpine319/meta.json               | 21 +++++
 .../7-5/alpine319/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-5/alpine319/test-deps/meta.json     | 16 ++++
 16 files changed, 664 insertions(+)
 create mode 100644 release/7-4/alpine318/docker/Dockerfile
 create mode 100644 release/7-4/alpine318/meta.json
 create mode 100644 release/7-4/alpine318/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/alpine318/test-deps/meta.json
 create mode 100644 release/7-4/alpine319/docker/Dockerfile
 create mode 100644 release/7-4/alpine319/meta.json
 create mode 100644 release/7-4/alpine319/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/alpine319/test-deps/meta.json
 create mode 100644 release/7-5/alpine318/docker/Dockerfile
 create mode 100644 release/7-5/alpine318/meta.json
 create mode 100644 release/7-5/alpine318/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/alpine318/test-deps/meta.json
 create mode 100644 release/7-5/alpine319/docker/Dockerfile
 create mode 100644 release/7-5/alpine319/meta.json
 create mode 100644 release/7-5/alpine319/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/alpine319/test-deps/meta.json

diff --git a/release/7-4/alpine318/docker/Dockerfile b/release/7-4/alpine318/docker/Dockerfile
new file mode 100644
index 000000000..bfdc0a120
--- /dev/null
+++ b/release/7-4/alpine318/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.18 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.4.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.18
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.18
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine318/meta.json b/release/7-4/alpine318/meta.json
new file mode 100644
index 000000000..948569c8c
--- /dev/null
+++ b/release/7-4/alpine318/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.18",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.18"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-4/alpine318/test-deps/docker/Dockerfile b/release/7-4/alpine318/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1bf93296a
--- /dev/null
+++ b/release/7-4/alpine318/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.18
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.18
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine318/test-deps/meta.json b/release/7-4/alpine318/test-deps/meta.json
new file mode 100644
index 000000000..a3d5a96c8
--- /dev/null
+++ b/release/7-4/alpine318/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.18",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-4/alpine319/docker/Dockerfile b/release/7-4/alpine319/docker/Dockerfile
new file mode 100644
index 000000000..e7bc52feb
--- /dev/null
+++ b/release/7-4/alpine319/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.19 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.4.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.19
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.19
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl3 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine319/meta.json b/release/7-4/alpine319/meta.json
new file mode 100644
index 000000000..48af7a557
--- /dev/null
+++ b/release/7-4/alpine319/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.19",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.19"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-4/alpine319/test-deps/docker/Dockerfile b/release/7-4/alpine319/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c70304476
--- /dev/null
+++ b/release/7-4/alpine319/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.19
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.19
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine319/test-deps/meta.json b/release/7-4/alpine319/test-deps/meta.json
new file mode 100644
index 000000000..838508293
--- /dev/null
+++ b/release/7-4/alpine319/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.19",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-5/alpine318/docker/Dockerfile b/release/7-5/alpine318/docker/Dockerfile
new file mode 100644
index 000000000..c2c0d34ab
--- /dev/null
+++ b/release/7-5/alpine318/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.18 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.18
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.18
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine318/meta.json b/release/7-5/alpine318/meta.json
new file mode 100644
index 000000000..948569c8c
--- /dev/null
+++ b/release/7-5/alpine318/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.18",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.18"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-5/alpine318/test-deps/docker/Dockerfile b/release/7-5/alpine318/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..1bf93296a
--- /dev/null
+++ b/release/7-5/alpine318/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.18
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.18
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine318/test-deps/meta.json b/release/7-5/alpine318/test-deps/meta.json
new file mode 100644
index 000000000..a3d5a96c8
--- /dev/null
+++ b/release/7-5/alpine318/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.18",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-5/alpine319/docker/Dockerfile b/release/7-5/alpine319/docker/Dockerfile
new file mode 100644
index 000000000..bbe7664a4
--- /dev/null
+++ b/release/7-5/alpine319/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.19 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.19
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.19
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl3 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine319/meta.json b/release/7-5/alpine319/meta.json
new file mode 100644
index 000000000..48af7a557
--- /dev/null
+++ b/release/7-5/alpine319/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.19",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.19"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-5/alpine319/test-deps/docker/Dockerfile b/release/7-5/alpine319/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c70304476
--- /dev/null
+++ b/release/7-5/alpine319/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.19
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.19
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine319/test-deps/meta.json b/release/7-5/alpine319/test-deps/meta.json
new file mode 100644
index 000000000..838508293
--- /dev/null
+++ b/release/7-5/alpine319/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.19",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}

From 7842215035640390463a0ad86116f4a1e1fdaa07 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 9 Oct 2024 19:29:18 -0400
Subject: [PATCH 338/354] Add support for Ubuntu24.04 (#828)

* initial commit for ubuntu24.04 support

* fix PS_PACKAGE for stable file

* refer to latest preview release .deb

* add ubuntu 24.04 arm32 image

* can't add support for stable until PMC change is backported in next stable release

* use original libssl3 package

* use sudo with tar command

* install sudo

* change platform from v7 to v8

* remove arm32 image
---
 release/7-5/ubuntu24.04/docker/Dockerfile     | 95 +++++++++++++++++++
 release/7-5/ubuntu24.04/meta.json             | 21 ++++
 .../ubuntu24.04/test-deps/docker/Dockerfile   | 23 +++++
 release/7-5/ubuntu24.04/test-deps/meta.json   | 16 ++++
 4 files changed, 155 insertions(+)
 create mode 100644 release/7-5/ubuntu24.04/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu24.04/meta.json
 create mode 100644 release/7-5/ubuntu24.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/ubuntu24.04/test-deps/meta.json

diff --git a/release/7-5/ubuntu24.04/docker/Dockerfile b/release/7-5/ubuntu24.04/docker/Dockerfile
new file mode 100644
index 000000000..0a84d34d7
--- /dev/null
+++ b/release/7-5/ubuntu24.04/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:24.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:24.04 AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-24.04
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu74 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-5/ubuntu24.04/meta.json b/release/7-5/ubuntu24.04/meta.json
new file mode 100644
index 000000000..be180d8ec
--- /dev/null
+++ b/release/7-5/ubuntu24.04/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Ubuntu 24.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "noble"},
+        {"Tag": "24.04"}
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "TestProperties": {
+        "size": 337
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2029-04-01",
+    "DistributionState": "Validating"
+}
diff --git a/release/7-5/ubuntu24.04/test-deps/docker/Dockerfile b/release/7-5/ubuntu24.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..f048dd0e2
--- /dev/null
+++ b/release/7-5/ubuntu24.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-24.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-24.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/ubuntu24.04/test-deps/meta.json b/release/7-5/ubuntu24.04/test-deps/meta.json
new file mode 100644
index 000000000..9230901ed
--- /dev/null
+++ b/release/7-5/ubuntu24.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 24.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 390
+    }
+}

From c7a7990e745b988b6dbf740c409a46ac4ed9df3f Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 14 Oct 2024 13:44:40 -0700
Subject: [PATCH 339/354] Disable new images from being used in CI (#831)

---
 release/7-5/azurelinux3/meta.json | 3 ++-
 release/7-5/debian12/meta.json    | 3 ++-
 release/7-5/ubuntu24.04/meta.json | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/release/7-5/azurelinux3/meta.json b/release/7-5/azurelinux3/meta.json
index a47740aa7..0babf5c11 100644
--- a/release/7-5/azurelinux3/meta.json
+++ b/release/7-5/azurelinux3/meta.json
@@ -11,5 +11,6 @@
         "size": 335
     },
     "EndOfLife": "2026-01-14",
-    "DistributionState": "Validating"
+    "DistributionState": "Validating",
+    "UseInCi": false
 }
diff --git a/release/7-5/debian12/meta.json b/release/7-5/debian12/meta.json
index b04681aa7..1bdb0da62 100644
--- a/release/7-5/debian12/meta.json
+++ b/release/7-5/debian12/meta.json
@@ -14,6 +14,7 @@
         "size": 490
     },
     "EndOfLife": "2025-12-25",
-    "DistributionState": "Validating"
+    "DistributionState": "Validating",
+    "UseInCi": false
 }
 
diff --git a/release/7-5/ubuntu24.04/meta.json b/release/7-5/ubuntu24.04/meta.json
index be180d8ec..9d0e6ba61 100644
--- a/release/7-5/ubuntu24.04/meta.json
+++ b/release/7-5/ubuntu24.04/meta.json
@@ -17,5 +17,6 @@
     },
     "SubImage": "test-deps",
     "EndOfLife": "2029-04-01",
-    "DistributionState": "Validating"
+    "DistributionState": "Validating",
+    "UseInCi": false
 }

From 7ed1970cf38e225e3db680902c34c8079a6c04ab Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 14 Oct 2024 18:42:34 -0400
Subject: [PATCH 340/354] Enable Debian12 in CI (#832)

---
 release/7-5/debian12/meta.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/release/7-5/debian12/meta.json b/release/7-5/debian12/meta.json
index 1bdb0da62..b04681aa7 100644
--- a/release/7-5/debian12/meta.json
+++ b/release/7-5/debian12/meta.json
@@ -14,7 +14,6 @@
         "size": 490
     },
     "EndOfLife": "2025-12-25",
-    "DistributionState": "Validating",
-    "UseInCi": false
+    "DistributionState": "Validating"
 }
 

From c452f6e5a526f717dcb9c4a49a3f33dd77f156b1 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 21 Oct 2024 12:27:16 -0400
Subject: [PATCH 341/354] use AFD link over SASUrl (#834)

---
 .vsts-ci/releaseJob.yml | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index 5ea048866..6130b3c85 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -72,31 +72,10 @@ jobs:
     displayName: Get Proper ImageName and ContextFolder
     name: setImageNameStep
   - pwsh: |
-      $modules = 'Az.Accounts', 'Az.Storage'
-      foreach ($module in $modules) {
-        if (!(Get-Module $module -listavailable)) {
-          Write-Host "installing $module..." -verbose
-          Install-Module $module -force -allowclobber
-        } else {
-          Write-Host "$module is already installed" -verbose
-        }
-      }
-    displayName: 'Install AzAccounts'
-  - task: AzurePowerShell@5
-    inputs:
-      azureSubscription: az-blob-cicd-infra
-      scriptType: inlineScript
-      azurePowerShellVersion: latestVersion
-      pwsh: true
-      inline: |
-        $containerName = Out-String -InputObject $(DOCKERNAMESPACE) -NoNewline
-        $containerName = $containerName.Replace('.', '-')
-        $context = New-AzStorageContext -StorageAccountName $(StorageAccount)
-        $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly
-        $uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net")
-        $uriBuilder.Query = $querystring.ToString()
-        $url = $uriBuilder.ToString()
-        Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
+      $afdUri = "https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install/?fakesas=yes"
+      $uriObj = [System.Uri]::new($uri)
+      $url =  $uriObj.ToString()
+      Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'
   - pwsh: |
       Get-ChildItem env: | Out-String -Width 1000

From a42f8412b753a68bc86174e984cea9b37c8143e1 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 21 Oct 2024 17:20:05 -0400
Subject: [PATCH 342/354] fix variable name typo (#835)

---
 .vsts-ci/releaseJob.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index 6130b3c85..75a1b3722 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -73,7 +73,7 @@ jobs:
     name: setImageNameStep
   - pwsh: |
       $afdUri = "https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install/?fakesas=yes"
-      $uriObj = [System.Uri]::new($uri)
+      $uriObj = [System.Uri]::new($afdUri)
       $url =  $uriObj.ToString()
       Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
     displayName: 'Set SasUrl variable'

From 8949770212a5fa4733636c7077a1d17113adc09e Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 5 Nov 2024 10:59:56 -0500
Subject: [PATCH 343/354] Use Ubuntu host image (#837)

---
 .pipelines/PowerShell-Docker-Image-Build-Official.yml   | 6 +++++-
 .pipelines/PowerShell-Docker-Image-Release-Official.yml | 3 +++
 .vsts-ci/releaseJob.yml                                 | 6 ------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
index 290143f2a..a90dd7b56 100644
--- a/.pipelines/PowerShell-Docker-Image-Build-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -21,7 +21,7 @@ variables:
 - name: DisableDockerDetector
   value: true
 - name: LinuxContainerImage
-  value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
+  value: onebranch.azurecr.io/linux/ubuntu-2004:latest
 - name: WindowsContainerImage
   value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
 - name: ob_sdl_sbom_enabled
@@ -42,6 +42,10 @@ extends:
   parameters:
     featureFlags:
       runHostSDL: true
+      # Work around regression in OneBranch docker builds
+      needExceptionForUbuntuUsage: true
+      LinuxHostVersion:
+        Distribution: Ubuntu
     customTags: 'ES365AIMigrationTooling-BulkMigrated'
     stages:
     - stage: StageResolveVersionandYaml
diff --git a/.pipelines/PowerShell-Docker-Image-Release-Official.yml b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
index 532325ffb..2561ef36d 100644
--- a/.pipelines/PowerShell-Docker-Image-Release-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
@@ -225,6 +225,9 @@ extends:
           demands:
           - ImageOverride -equals PSMMSUbuntu20.04-Secure-120GB
         steps:
+          - checkout: self
+            clean: true
+            lfs: false
           - task: DownloadPipelineArtifact@2
             inputs:
               targetPath: $(Pipeline.Workspace)
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index 75a1b3722..32d6dc78f 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -128,12 +128,6 @@ jobs:
       targetPath: $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
       artifact: drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
     displayName: 'Download artifact to which Dockerfile was uploaded'
-  - task: onebranch.pipeline.containercontrol@1
-    displayName: "Login to source ACR"
-    inputs:
-      command: login
-      acr_name: $(ACRName)
-      tenant: MSFT
   - task: onebranch.pipeline.imagebuildinfo@1
     displayName: image build
     inputs:

From 026d954c42cefbb6db0128c061a605963157641b Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 5 Nov 2024 16:45:49 -0500
Subject: [PATCH 344/354] bugfix for how package Url is created (#838)

---
 .vsts-ci/releaseJob.yml            | 4 +---
 tools/buildHelper/buildHelper.psm1 | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
index 32d6dc78f..41000caed 100644
--- a/.vsts-ci/releaseJob.yml
+++ b/.vsts-ci/releaseJob.yml
@@ -73,9 +73,7 @@ jobs:
     name: setImageNameStep
   - pwsh: |
       $afdUri = "https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/install/?fakesas=yes"
-      $uriObj = [System.Uri]::new($afdUri)
-      $url =  $uriObj.ToString()
-      Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
+      Write-Host "##vso[task.setvariable variable=SasUrl;]$afdUri"
     displayName: 'Set SasUrl variable'
   - pwsh: |
       Get-ChildItem env: | Out-String -Width 1000
diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1
index 69c6f7038..01aa55f94 100644
--- a/tools/buildHelper/buildHelper.psm1
+++ b/tools/buildHelper/buildHelper.psm1
@@ -906,18 +906,18 @@ function Get-SASBuildArgs
 
             $packageName = $allMeta.meta.PackageFormat -replace '\${PS_VERSION}', $packageVersion
             $packageName = $packageName -replace '\${channelTag}', $channelTag
-            $containerName = 'v' + ($psversion -replace '\.', '-') -replace '~', '-'
+            $containerName = 'v' + ($psversion) -replace '~', '-'
             $packageUrl.Path = $packageUrl.Path + $containerName + '/' + $packageName
             $packageUrl.Query = $sasData.sasQuery
             if($allMeta.meta.Base64EncodePackageUrl)
             {
-                $urlBytes = [System.Text.Encoding]::Unicode.GetBytes($packageUrl.ToString())
+                $urlBytes = [System.Text.Encoding]::Unicode.GetBytes($packageUrl.Uri.ToString())
                 $encodedUrl =[Convert]::ToBase64String($urlBytes)
                 $buildArgs.Add('PS_PACKAGE_URL_BASE64', $encodedUrl)
             }
             else
             {
-                $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.ToString())
+                $buildArgs.Add('PS_PACKAGE_URL', $packageUrl.Uri.ToString())
             }
         }
     }

From d71f298d04869a537c6ffaf68f71f43e6f349695 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Tue, 5 Nov 2024 18:41:33 -0500
Subject: [PATCH 345/354] add support for Alpine 3.20 (#830)

---
 release/7-4/alpine320/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-4/alpine320/meta.json               | 21 +++++
 .../7-4/alpine320/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-4/alpine320/test-deps/meta.json     | 16 ++++
 release/7-5/alpine320/docker/Dockerfile       | 92 +++++++++++++++++++
 release/7-5/alpine320/meta.json               | 21 +++++
 .../7-5/alpine320/test-deps/docker/Dockerfile | 37 ++++++++
 release/7-5/alpine320/test-deps/meta.json     | 16 ++++
 8 files changed, 332 insertions(+)
 create mode 100644 release/7-4/alpine320/docker/Dockerfile
 create mode 100644 release/7-4/alpine320/meta.json
 create mode 100644 release/7-4/alpine320/test-deps/docker/Dockerfile
 create mode 100644 release/7-4/alpine320/test-deps/meta.json
 create mode 100644 release/7-5/alpine320/docker/Dockerfile
 create mode 100644 release/7-5/alpine320/meta.json
 create mode 100644 release/7-5/alpine320/test-deps/docker/Dockerfile
 create mode 100644 release/7-5/alpine320/test-deps/meta.json

diff --git a/release/7-4/alpine320/docker/Dockerfile b/release/7-4/alpine320/docker/Dockerfile
new file mode 100644
index 000000000..635ddc8dc
--- /dev/null
+++ b/release/7-4/alpine320/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.4.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.20
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl3 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine320/meta.json b/release/7-4/alpine320/meta.json
new file mode 100644
index 000000000..cacb03e46
--- /dev/null
+++ b/release/7-4/alpine320/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.20",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.20"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2025-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-4/alpine320/test-deps/docker/Dockerfile b/release/7-4/alpine320/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..7299db2b1
--- /dev/null
+++ b/release/7-4/alpine320/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.20
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.20
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-4/alpine320/test-deps/meta.json b/release/7-4/alpine320/test-deps/meta.json
new file mode 100644
index 000000000..92894afa6
--- /dev/null
+++ b/release/7-4/alpine320/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.20",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-5/alpine320/docker/Dockerfile b/release/7-5/alpine320/docker/Dockerfile
new file mode 100644
index 000000000..b4c4b0965
--- /dev/null
+++ b/release/7-5/alpine320/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.20
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl3 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine320/meta.json b/release/7-5/alpine320/meta.json
new file mode 100644
index 000000000..cacb03e46
--- /dev/null
+++ b/release/7-5/alpine320/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.20",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.20"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2025-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-5/alpine320/test-deps/docker/Dockerfile b/release/7-5/alpine320/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..7299db2b1
--- /dev/null
+++ b/release/7-5/alpine320/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.20
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.20
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-5/alpine320/test-deps/meta.json b/release/7-5/alpine320/test-deps/meta.json
new file mode 100644
index 000000000..92894afa6
--- /dev/null
+++ b/release/7-5/alpine320/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.20",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}

From d12ee12818bcb0285509421b9109d5339cf3d370 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 6 Nov 2024 15:25:40 -0500
Subject: [PATCH 346/354] EOL alpine 3.18 and 3.19 images (#839)

---
 release/7-4/alpine318/docker/Dockerfile       | 92 -------------------
 release/7-4/alpine318/meta.json               | 21 -----
 .../7-4/alpine318/test-deps/docker/Dockerfile | 37 --------
 release/7-4/alpine318/test-deps/meta.json     | 16 ----
 release/7-4/alpine319/docker/Dockerfile       | 92 -------------------
 release/7-4/alpine319/meta.json               | 21 -----
 .../7-4/alpine319/test-deps/docker/Dockerfile | 37 --------
 release/7-4/alpine319/test-deps/meta.json     | 16 ----
 release/7-5/alpine318/docker/Dockerfile       | 92 -------------------
 release/7-5/alpine318/meta.json               | 21 -----
 .../7-5/alpine318/test-deps/docker/Dockerfile | 37 --------
 release/7-5/alpine318/test-deps/meta.json     | 16 ----
 release/7-5/alpine319/docker/Dockerfile       | 92 -------------------
 release/7-5/alpine319/meta.json               | 21 -----
 .../7-5/alpine319/test-deps/docker/Dockerfile | 37 --------
 release/7-5/alpine319/test-deps/meta.json     | 16 ----
 16 files changed, 664 deletions(-)
 delete mode 100644 release/7-4/alpine318/docker/Dockerfile
 delete mode 100644 release/7-4/alpine318/meta.json
 delete mode 100644 release/7-4/alpine318/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/alpine318/test-deps/meta.json
 delete mode 100644 release/7-4/alpine319/docker/Dockerfile
 delete mode 100644 release/7-4/alpine319/meta.json
 delete mode 100644 release/7-4/alpine319/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/alpine319/test-deps/meta.json
 delete mode 100644 release/7-5/alpine318/docker/Dockerfile
 delete mode 100644 release/7-5/alpine318/meta.json
 delete mode 100644 release/7-5/alpine318/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/alpine318/test-deps/meta.json
 delete mode 100644 release/7-5/alpine319/docker/Dockerfile
 delete mode 100644 release/7-5/alpine319/meta.json
 delete mode 100644 release/7-5/alpine319/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/alpine319/test-deps/meta.json

diff --git a/release/7-4/alpine318/docker/Dockerfile b/release/7-4/alpine318/docker/Dockerfile
deleted file mode 100644
index bfdc0a120..000000000
--- a/release/7-4/alpine318/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.18 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.4.5
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.18
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.18
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine318/meta.json b/release/7-4/alpine318/meta.json
deleted file mode 100644
index 948569c8c..000000000
--- a/release/7-4/alpine318/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.18",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.18"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "manifestLists": [
-        "${channelTagPrefix}alpine"
-    ],
-    "UseInCi": false
-}
diff --git a/release/7-4/alpine318/test-deps/docker/Dockerfile b/release/7-4/alpine318/test-deps/docker/Dockerfile
deleted file mode 100644
index 1bf93296a..000000000
--- a/release/7-4/alpine318/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.18
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.18
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        musl \
-        musl-locales \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine318/test-deps/meta.json b/release/7-4/alpine318/test-deps/meta.json
deleted file mode 100644
index a3d5a96c8..000000000
--- a/release/7-4/alpine318/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.18",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-4/alpine319/docker/Dockerfile b/release/7-4/alpine319/docker/Dockerfile
deleted file mode 100644
index e7bc52feb..000000000
--- a/release/7-4/alpine319/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.19 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.4.5
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.19
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.19
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl3 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine319/meta.json b/release/7-4/alpine319/meta.json
deleted file mode 100644
index 48af7a557..000000000
--- a/release/7-4/alpine319/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.19",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.19"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "manifestLists": [
-        "${channelTagPrefix}alpine"
-    ],
-    "UseInCi": false
-}
diff --git a/release/7-4/alpine319/test-deps/docker/Dockerfile b/release/7-4/alpine319/test-deps/docker/Dockerfile
deleted file mode 100644
index c70304476..000000000
--- a/release/7-4/alpine319/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.19
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.19
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        musl \
-        musl-locales \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/alpine319/test-deps/meta.json b/release/7-4/alpine319/test-deps/meta.json
deleted file mode 100644
index 838508293..000000000
--- a/release/7-4/alpine319/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.19",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-5/alpine318/docker/Dockerfile b/release/7-5/alpine318/docker/Dockerfile
deleted file mode 100644
index c2c0d34ab..000000000
--- a/release/7-5/alpine318/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.18 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.5.0-preview.5
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.18
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.18
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl1.1 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine318/meta.json b/release/7-5/alpine318/meta.json
deleted file mode 100644
index 948569c8c..000000000
--- a/release/7-5/alpine318/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.18",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.18"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "manifestLists": [
-        "${channelTagPrefix}alpine"
-    ],
-    "UseInCi": false
-}
diff --git a/release/7-5/alpine318/test-deps/docker/Dockerfile b/release/7-5/alpine318/test-deps/docker/Dockerfile
deleted file mode 100644
index 1bf93296a..000000000
--- a/release/7-5/alpine318/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.18
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.18
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        musl \
-        musl-locales \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine318/test-deps/meta.json b/release/7-5/alpine318/test-deps/meta.json
deleted file mode 100644
index a3d5a96c8..000000000
--- a/release/7-5/alpine318/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.18",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}
diff --git a/release/7-5/alpine319/docker/Dockerfile b/release/7-5/alpine319/docker/Dockerfile
deleted file mode 100644
index bbe7664a4..000000000
--- a/release/7-5/alpine319/docker/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.19 AS installer-env
-
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.5.0-preview.5
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-ARG hostRegistry=psdockercache.azurecr.io
-FROM ${hostRegistry}/alpine:3.19
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
-  # Define ENVs for Localization/Globalization
-  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-  LC_ALL=en_US.UTF-8 \
-  LANG=en_US.UTF-8 \
-  # set a fixed location for the Module analysis cache
-  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.19
-
-# Install dotnet dependencies and ca-certificates
-RUN apk add --no-cache \
-  ca-certificates \
-  less \
-  \
-  # PSReadline/console dependencies
-  ncurses-terminfo-base \
-  \
-  # .NET Core dependencies
-  krb5-libs \
-  libgcc \
-  libintl \
-  libssl3 \
-  libstdc++ \
-  tzdata \
-  userspace-rcu \
-  zlib \
-  icu-libs \
-  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
-  lttng-ust \
-  \
-  # PowerShell remoting over SSH dependencies
-  openssh-client \
-  \
-  && apk update \
-  && apk upgrade \
-  # Create the pwsh symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-  \
-  # Create the pwsh-preview symbolic link that points to powershell
-  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-  # Give all user execute permissions and remove write permissions for others
-  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-  # intialize powershell module cache
-  # and disable telemetry
-  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-  && pwsh \
-  -NoLogo \
-  -NoProfile \
-  -Command " \
-  \$ErrorActionPreference = 'Stop' ; \
-  \$ProgressPreference = 'SilentlyContinue' ; \
-  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-  Start-Sleep -Seconds 6 ; \
-  }"
-
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine319/meta.json b/release/7-5/alpine319/meta.json
deleted file mode 100644
index 48af7a557..000000000
--- a/release/7-5/alpine319/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
-    "osVersion": "Alpine 3.19",
-    "shortDistroName": "alpine",
-    "shortTags": [
-        {"Tag": "3.19"}
-    ],
-    "SkipGssNtlmSspTests": true,
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 252
-    },
-    "EndOfLife": "2023-11-01",
-    "DistributionState": "Validating",
-    "manifestLists": [
-        "${channelTagPrefix}alpine"
-    ],
-    "UseInCi": false
-}
diff --git a/release/7-5/alpine319/test-deps/docker/Dockerfile b/release/7-5/alpine319/test-deps/docker/Dockerfile
deleted file mode 100644
index c70304476..000000000
--- a/release/7-5/alpine319/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Docker image file that describes an Alpine image with PowerShell and test dependencies
-
-ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.19
-
-FROM ${BaseImage}
-
-ENV NODE_VERSION=14.17.6 \
-    YARN_VERSION=1.22.5 \
-    NVM_DIR="/root/.nvm" \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.19
-
-# workaround for Alpine to run in Azure DevOps
-ENV NODE_NO_WARNINGS=1
-
-RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
-    && apk add --no-cache \
-        bash \
-        sudo \
-        shadow \
-        openssl \
-        curl \
-        git \
-        unzip \
-        musl \
-        musl-locales \
-        nodejs \
-    && apk update \
-    && apk upgrade \
-    && apk del .pipeline-deps \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
-
-LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/alpine319/test-deps/meta.json b/release/7-5/alpine319/test-deps/meta.json
deleted file mode 100644
index 838508293..000000000
--- a/release/7-5/alpine319/test-deps/meta.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "IsLinux": true,
-    "UseLinuxVersion": false,
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Alpine 3.19",
-    "tagTemplates": [
-        "alpine-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps",
-        "test-deps-musl"
-    ],
-    "TestProperties": {
-        "size": 335
-    }
-}

From e3af4cb60a7b551492aa355dcc2388c4043e55a7 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 7 Nov 2024 16:33:33 -0500
Subject: [PATCH 347/354] Update build yaml files with newly added distros
 (#840)

---
 .vsts-ci/previewReleaseStage.yml | 40 ++++++++++++++++++++++++++++++++
 .vsts-ci/stableReleaseStage.yml  | 30 ++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index 2beb159be..6e9020582 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -20,6 +20,26 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine320
+      artifactSuffix: alpine320
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: azurelinux3
+      artifactSuffix: azurelinux3
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -80,6 +100,16 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: ubuntu24.04
+      artifactSuffix: ubuntu2404
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm32'
@@ -100,6 +130,16 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_arm64'
+      imageName: azurelinux3-arm64
+      artifactSuffix: azurelinux3_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm64'
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index 796f5b6ac..7f03bfc03 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -20,6 +20,26 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: alpine320
+      artifactSuffix: alpine320
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: azurelinux3
+      artifactSuffix: azurelinux3
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -100,6 +120,16 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_arm64'
+      imageName: azurelinux3-arm64
+      artifactSuffix: azurelinux3_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_arm64'

From 6465ae3a4650289ab5150a46a2c47664337c7c70 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 16 Jan 2025 15:39:10 -0500
Subject: [PATCH 348/354] Add distribution images for powershell 7-6 release
 folder (#842)

---
 release/7-6/alpine317/docker/Dockerfile       |  92 ++++++++++++++++
 release/7-6/alpine317/meta.json               |  21 ++++
 .../7-6/alpine317/test-deps/docker/Dockerfile |  37 +++++++
 release/7-6/alpine317/test-deps/meta.json     |  16 +++
 release/7-6/alpine320/docker/Dockerfile       |  92 ++++++++++++++++
 release/7-6/alpine320/meta.json               |  21 ++++
 .../7-6/alpine320/test-deps/docker/Dockerfile |  37 +++++++
 release/7-6/alpine320/test-deps/meta.json     |  16 +++
 .../7-6/azurelinux3-arm64/docker/Dockerfile   | 100 +++++++++++++++++
 release/7-6/azurelinux3-arm64/meta.json       |  19 ++++
 release/7-6/azurelinux3/docker/Dockerfile     | 101 +++++++++++++++++
 release/7-6/azurelinux3/meta.json             |  16 +++
 release/7-6/debian12/docker/Dockerfile        | 102 ++++++++++++++++++
 release/7-6/debian12/meta.json                |  19 ++++
 .../7-6/debian12/test-deps/docker/Dockerfile  |  24 +++++
 release/7-6/debian12/test-deps/meta.json      |  16 +++
 release/7-6/mariner2-arm64/docker/Dockerfile  | 100 +++++++++++++++++
 release/7-6/mariner2-arm64/meta.json          |  19 ++++
 release/7-6/mariner2/docker/Dockerfile        | 102 ++++++++++++++++++
 release/7-6/mariner2/meta.json                |  15 +++
 release/7-6/ubi8/docker/Dockerfile            |  59 ++++++++++
 release/7-6/ubi8/meta.json                    |  17 +++
 release/7-6/ubi8/test-deps/docker/Dockerfile  |  23 ++++
 release/7-6/ubi8/test-deps/meta.json          |  20 ++++
 release/7-6/ubi9/docker/Dockerfile            |  62 +++++++++++
 release/7-6/ubi9/meta.json                    |  21 ++++
 release/7-6/ubi9/test-deps/docker/Dockerfile  |  23 ++++
 release/7-6/ubi9/test-deps/meta.json          |  20 ++++
 .../7-6/ubuntu20.04-arm32v7/docker/Dockerfile |  65 +++++++++++
 release/7-6/ubuntu20.04-arm32v7/meta.json     |  22 ++++
 release/7-6/ubuntu20.04/docker/Dockerfile     |  97 +++++++++++++++++
 release/7-6/ubuntu20.04/meta.json             |  19 ++++
 .../ubuntu20.04/test-deps/docker/Dockerfile   |  23 ++++
 release/7-6/ubuntu20.04/test-deps/meta.json   |  16 +++
 .../7-6/ubuntu22.04-arm32v7/docker/Dockerfile |  62 +++++++++++
 release/7-6/ubuntu22.04-arm32v7/meta.json     |  25 +++++
 release/7-6/ubuntu22.04/docker/Dockerfile     |  95 ++++++++++++++++
 release/7-6/ubuntu22.04/meta.json             |  21 ++++
 .../ubuntu22.04/test-deps/docker/Dockerfile   |  23 ++++
 release/7-6/ubuntu22.04/test-deps/meta.json   |  16 +++
 release/7-6/ubuntu24.04/docker/Dockerfile     |  95 ++++++++++++++++
 release/7-6/ubuntu24.04/meta.json             |  22 ++++
 .../ubuntu24.04/test-deps/docker/Dockerfile   |  23 ++++
 release/7-6/ubuntu24.04/test-deps/meta.json   |  16 +++
 .../7-6/windowsserver2022/docker/Dockerfile   |  72 +++++++++++++
 release/7-6/windowsserver2022/meta.json       |  21 ++++
 .../windowsservercore2022/docker/Dockerfile   |  72 +++++++++++++
 release/7-6/windowsservercore2022/meta.json   |  21 ++++
 tools/buildHelper/channels.json               |   2 +-
 49 files changed, 2037 insertions(+), 1 deletion(-)
 create mode 100644 release/7-6/alpine317/docker/Dockerfile
 create mode 100644 release/7-6/alpine317/meta.json
 create mode 100644 release/7-6/alpine317/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/alpine317/test-deps/meta.json
 create mode 100644 release/7-6/alpine320/docker/Dockerfile
 create mode 100644 release/7-6/alpine320/meta.json
 create mode 100644 release/7-6/alpine320/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/alpine320/test-deps/meta.json
 create mode 100644 release/7-6/azurelinux3-arm64/docker/Dockerfile
 create mode 100644 release/7-6/azurelinux3-arm64/meta.json
 create mode 100644 release/7-6/azurelinux3/docker/Dockerfile
 create mode 100644 release/7-6/azurelinux3/meta.json
 create mode 100644 release/7-6/debian12/docker/Dockerfile
 create mode 100644 release/7-6/debian12/meta.json
 create mode 100644 release/7-6/debian12/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/debian12/test-deps/meta.json
 create mode 100644 release/7-6/mariner2-arm64/docker/Dockerfile
 create mode 100644 release/7-6/mariner2-arm64/meta.json
 create mode 100644 release/7-6/mariner2/docker/Dockerfile
 create mode 100644 release/7-6/mariner2/meta.json
 create mode 100644 release/7-6/ubi8/docker/Dockerfile
 create mode 100644 release/7-6/ubi8/meta.json
 create mode 100644 release/7-6/ubi8/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/ubi8/test-deps/meta.json
 create mode 100644 release/7-6/ubi9/docker/Dockerfile
 create mode 100644 release/7-6/ubi9/meta.json
 create mode 100644 release/7-6/ubi9/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/ubi9/test-deps/meta.json
 create mode 100644 release/7-6/ubuntu20.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu20.04-arm32v7/meta.json
 create mode 100644 release/7-6/ubuntu20.04/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu20.04/meta.json
 create mode 100644 release/7-6/ubuntu20.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu20.04/test-deps/meta.json
 create mode 100644 release/7-6/ubuntu22.04-arm32v7/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu22.04-arm32v7/meta.json
 create mode 100644 release/7-6/ubuntu22.04/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu22.04/meta.json
 create mode 100644 release/7-6/ubuntu22.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu22.04/test-deps/meta.json
 create mode 100644 release/7-6/ubuntu24.04/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu24.04/meta.json
 create mode 100644 release/7-6/ubuntu24.04/test-deps/docker/Dockerfile
 create mode 100644 release/7-6/ubuntu24.04/test-deps/meta.json
 create mode 100644 release/7-6/windowsserver2022/docker/Dockerfile
 create mode 100644 release/7-6/windowsserver2022/meta.json
 create mode 100644 release/7-6/windowsservercore2022/docker/Dockerfile
 create mode 100644 release/7-6/windowsservercore2022/meta.json

diff --git a/release/7-6/alpine317/docker/Dockerfile b/release/7-6/alpine317/docker/Dockerfile
new file mode 100644
index 000000000..c6c3f950f
--- /dev/null
+++ b/release/7-6/alpine317/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.17
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.17
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl1.1 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-6/alpine317/meta.json b/release/7-6/alpine317/meta.json
new file mode 100644
index 000000000..dd83a9823
--- /dev/null
+++ b/release/7-6/alpine317/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.17",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.17"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2023-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-6/alpine317/test-deps/docker/Dockerfile b/release/7-6/alpine317/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..f8d5d8113
--- /dev/null
+++ b/release/7-6/alpine317/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.17
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.17
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/alpine317/test-deps/meta.json b/release/7-6/alpine317/test-deps/meta.json
new file mode 100644
index 000000000..f5a9899ab
--- /dev/null
+++ b/release/7-6/alpine317/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.17",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-6/alpine320/docker/Dockerfile b/release/7-6/alpine320/docker/Dockerfile
new file mode 100644
index 000000000..b4c4b0965
--- /dev/null
+++ b/release/7-6/alpine320/docker/Dockerfile
@@ -0,0 +1,92 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Alpine image with PowerShell installed from .tar.gz file(s)
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-musl-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER} -v
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/alpine:3.20
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+  \
+  # Define ENVs for Localization/Globalization
+  DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+  LC_ALL=en_US.UTF-8 \
+  LANG=en_US.UTF-8 \
+  # set a fixed location for the Module analysis cache
+  PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+  POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Alpine-3.20
+
+# Install dotnet dependencies and ca-certificates
+RUN apk add --no-cache \
+  ca-certificates \
+  less \
+  \
+  # PSReadline/console dependencies
+  ncurses-terminfo-base \
+  \
+  # .NET Core dependencies
+  krb5-libs \
+  libgcc \
+  libintl \
+  libssl3 \
+  libstdc++ \
+  tzdata \
+  userspace-rcu \
+  zlib \
+  icu-libs \
+  && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
+  lttng-ust \
+  \
+  # PowerShell remoting over SSH dependencies
+  openssh-client \
+  \
+  && apk update \
+  && apk upgrade \
+  # Create the pwsh symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+  \
+  # Create the pwsh-preview symbolic link that points to powershell
+  && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+  # Give all user execute permissions and remove write permissions for others
+  && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+  # intialize powershell module cache
+  # and disable telemetry
+  && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+  && pwsh \
+  -NoLogo \
+  -NoProfile \
+  -Command " \
+  \$ErrorActionPreference = 'Stop' ; \
+  \$ProgressPreference = 'SilentlyContinue' ; \
+  while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+  Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+  Start-Sleep -Seconds 6 ; \
+  }"
+
+CMD [ "pwsh" ]
diff --git a/release/7-6/alpine320/meta.json b/release/7-6/alpine320/meta.json
new file mode 100644
index 000000000..cacb03e46
--- /dev/null
+++ b/release/7-6/alpine320/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-musl-x64.tar.gz",
+    "osVersion": "Alpine 3.20",
+    "shortDistroName": "alpine",
+    "shortTags": [
+        {"Tag": "3.20"}
+    ],
+    "SkipGssNtlmSspTests": true,
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 252
+    },
+    "EndOfLife": "2025-11-01",
+    "DistributionState": "Validating",
+    "manifestLists": [
+        "${channelTagPrefix}alpine"
+    ],
+    "UseInCi": false
+}
diff --git a/release/7-6/alpine320/test-deps/docker/Dockerfile b/release/7-6/alpine320/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..7299db2b1
--- /dev/null
+++ b/release/7-6/alpine320/test-deps/docker/Dockerfile
@@ -0,0 +1,37 @@
+# Docker image file that describes an Alpine image with PowerShell and test dependencies
+
+ARG BaseImage=mcr.microsoft.com/powershell:alpine-3.20
+
+FROM ${BaseImage}
+
+ENV NODE_VERSION=14.17.6 \
+    YARN_VERSION=1.22.5 \
+    NVM_DIR="/root/.nvm" \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Alpine-3.20
+
+# workaround for Alpine to run in Azure DevOps
+ENV NODE_NO_WARNINGS=1
+
+RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
+    && apk add --no-cache \
+        bash \
+        sudo \
+        shadow \
+        openssl \
+        curl \
+        git \
+        unzip \
+        musl \
+        musl-locales \
+        nodejs \
+    && apk update \
+    && apk upgrade \
+    && apk del .pipeline-deps \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+    && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
+
+LABEL com.azure.dev.pipelines.agent.handler.node.path="/usr/local/bin/node"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/alpine320/test-deps/meta.json b/release/7-6/alpine320/test-deps/meta.json
new file mode 100644
index 000000000..92894afa6
--- /dev/null
+++ b/release/7-6/alpine320/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux": true,
+    "UseLinuxVersion": false,
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Alpine 3.20",
+    "tagTemplates": [
+        "alpine-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-musl"
+    ],
+    "TestProperties": {
+        "size": 335
+    }
+}
diff --git a/release/7-6/azurelinux3-arm64/docker/Dockerfile b/release/7-6/azurelinux3-arm64/docker/Dockerfile
new file mode 100644
index 000000000..140174999
--- /dev/null
+++ b/release/7-6/azurelinux3-arm64/docker/Dockerfile
@@ -0,0 +1,100 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm64 mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PACKAGE_VERSION=7.5.0_preview.5
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.aarch64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-AzureLinux-3
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-6/azurelinux3-arm64/meta.json b/release/7-6/azurelinux3-arm64/meta.json
new file mode 100644
index 000000000..a71096ca2
--- /dev/null
+++ b/release/7-6/azurelinux3-arm64/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
+    "osVersion": "Azure Linux 3.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "azurelinux",
+    "shortTags": [
+        {"Tag": "3.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "Arm32": true
+    },
+    "EndOfLife": "2025-12-14",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}
diff --git a/release/7-6/azurelinux3/docker/Dockerfile b/release/7-6/azurelinux3/docker/Dockerfile
new file mode 100644
index 000000000..2eae2ee31
--- /dev/null
+++ b/release/7-6/azurelinux3/docker/Dockerfile
@@ -0,0 +1,101 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS setup-tdnf-repa
+
+    # Use the cache mount since this image does go into the final product
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y azurelinux-repos \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.5.0-preview.5
+    ARG PACKAGE_VERSION=7.5.0_preview.5
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+        wget \
+        awk \
+        tar \
+        ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.5.0-preview.5
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AzureLinux-3.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-6/azurelinux3/meta.json b/release/7-6/azurelinux3/meta.json
new file mode 100644
index 000000000..0babf5c11
--- /dev/null
+++ b/release/7-6/azurelinux3/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "AzureLinux 3.0",
+    "shortTags": [
+        {"Tag": "3.0"}
+    ],
+    "ShortDistroName": "azurelinux",
+    "TestProperties": {
+        "size": 335
+    },
+    "EndOfLife": "2026-01-14",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-6/debian12/docker/Dockerfile b/release/7-6/debian12/docker/Dockerfile
new file mode 100644
index 000000000..301af5d98
--- /dev/null
+++ b/release/7-6/debian12/docker/Dockerfile
@@ -0,0 +1,102 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define the folder we will be installing PowerShell to.
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
+
+# Create the install folder.
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+        tar \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/debian:bookworm AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-12
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu72 \
+        libssl3 \
+        libc6 \
+        libgcc-s1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-6/debian12/meta.json b/release/7-6/debian12/meta.json
new file mode 100644
index 000000000..b04681aa7
--- /dev/null
+++ b/release/7-6/debian12/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion" : false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Debian 12",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "debian",
+    "shortTags": [
+        {"Tag": "bookworm"},
+        {"Tag": "12"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 490
+    },
+    "EndOfLife": "2025-12-25",
+    "DistributionState": "Validating"
+}
+
diff --git a/release/7-6/debian12/test-deps/docker/Dockerfile b/release/7-6/debian12/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..497c7ecae
--- /dev/null
+++ b/release/7-6/debian12/test-deps/docker/Dockerfile
@@ -0,0 +1,24 @@
+# Docker image file that describes an Debian image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-12
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        procps \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Debian-12
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/debian12/test-deps/meta.json b/release/7-6/debian12/test-deps/meta.json
new file mode 100644
index 000000000..c1f64c631
--- /dev/null
+++ b/release/7-6/debian12/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Debian 12 (Testing)",
+    "tagTemplates": [
+        "debian-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 490
+    }
+}
diff --git a/release/7-6/mariner2-arm64/docker/Dockerfile b/release/7-6/mariner2-arm64/docker/Dockerfile
new file mode 100644
index 000000000..6f3b3e346
--- /dev/null
+++ b/release/7-6/mariner2-arm64/docker/Dockerfile
@@ -0,0 +1,100 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.5.0-preview.4
+    ARG PACKAGE_VERSION=7.5.0_preview.4
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.aarch64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+            wget \
+            awk \
+            tar \
+            ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.5.0-preview.4
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-6/mariner2-arm64/meta.json b/release/7-6/mariner2-arm64/meta.json
new file mode 100644
index 000000000..973e673ab
--- /dev/null
+++ b/release/7-6/mariner2-arm64/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
+    "osVersion": "Mariner 2.0 ARM 64v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "mariner",
+    "shortTags": [
+        {"Tag": "2.0-arm64"}
+    ],
+    "TestProperties": {
+        "size": 404,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-12-14",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm64"
+}
diff --git a/release/7-6/mariner2/docker/Dockerfile b/release/7-6/mariner2/docker/Dockerfile
new file mode 100644
index 000000000..e38a3ed56
--- /dev/null
+++ b/release/7-6/mariner2/docker/Dockerfile
@@ -0,0 +1,102 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS setup-tdnf-repa
+
+    # Use the cache mount since this image does go into the final product
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf install -y mariner-repos-microsoft-preview \
+        && tdnf makecache
+
+# Download packages into a container so they don't take up space in the final stage
+FROM setup-tdnf-repa AS installer-env
+
+    # Define Args for the needed to add the package
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PACKAGE_VERSION=7.3.0_preview.8
+    ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.cm.x86_64.rpm
+    ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Download the Linux tar.gz and save it
+    ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+
+    # Don't use the cache mount since this image doesn't go into the final product and it causes issues with parralel operations with the next layer
+    RUN tdnf install -y \
+        wget \
+        awk \
+        tar \
+        ca-certificates
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        --mount=type=cache,target=/installTmp \
+        cd /installTmp \
+        && wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
+        && chmod +x ./dotnet-install.sh \
+        && ./dotnet-install.sh -Channel 9.0 -Quality ga -Runtime dotnet -InstallDir /usr/share/dotnet
+
+    RUN echo ${PS_PACKAGE_URL}
+
+# Start a new stage so we lose all the package download layers from the final image
+FROM setup-tdnf-repa AS powershell
+
+    ARG PS_VERSION=7.3.0-preview.8
+    ARG PS_INSTALL_VERSION=7-preview
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
+
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        # install dependencies
+        tdnf install -y \
+        # required for localization
+        icu \
+        # required for help in PowerShell
+        less \
+        # required for SSH
+        openssh-clients \
+        ca-certificates
+
+    # Install dependencies and clean up
+    RUN --mount=type=cache,target=/var/cache/tdnf \
+        tdnf upgrade -y \
+        # clean cached data
+        && tdnf clean all
+
+    COPY --from=installer-env /usr/share/dotnet /usr/share/dotnet
+
+    RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+
+    RUN --mount=type=cache,target=/var/cache/tdnf,rw \
+        --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+        rpm -i --nodeps /mnt/rpm/powershell.rpm
+
+    # Create the pwsh symbolic link that points to powershell
+    RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
+
+    # intialize powershell module cache
+    # and disable telemetry for this ONE session
+    RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+        && pwsh \
+            -NoLogo \
+            -NoProfile \
+            -Command " \
+                \$ErrorActionPreference = 'Stop' ; \
+                \$ProgressPreference = 'SilentlyContinue' ; \
+                while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+                    Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+                    Start-Sleep -Seconds 6 ; \
+                }"
+
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-6/mariner2/meta.json b/release/7-6/mariner2/meta.json
new file mode 100644
index 000000000..de4bd4be1
--- /dev/null
+++ b/release/7-6/mariner2/meta.json
@@ -0,0 +1,15 @@
+{
+    "IsLinux" : true,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Mariner 2.0",
+    "shortTags": [
+        {"Tag": "2.0"}
+    ],
+    "ShortDistroName": "mariner",
+    "TestProperties": {
+        "size": 335
+    },
+    "EndOfLife": "2022-10-14",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-6/ubi8/docker/Dockerfile b/release/7-6/ubi8/docker/Dockerfile
new file mode 100644
index 000000000..8bfa52029
--- /dev/null
+++ b/release/7-6/ubi8/docker/Dockerfile
@@ -0,0 +1,59 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    # ubi 8 security updates are not marked as security updates.
+    && yum upgrade -y \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/7-6/ubi8/meta.json b/release/7-6/ubi8/meta.json
new file mode 100644
index 000000000..bc5a6587c
--- /dev/null
+++ b/release/7-6/ubi8/meta.json
@@ -0,0 +1,17 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 8",
+    "ShortDistroName": "ubi",
+    "shortTags": [
+        {"Tag": "8"}
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 700
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-6/ubi8/test-deps/docker/Dockerfile b/release/7-6/ubi8/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..c4df646c2
--- /dev/null
+++ b/release/7-6/ubi8/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        openssl \
+        hostname \
+        iputils \
+        procps-ng \
+        git \
+        unzip \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubi8/test-deps/meta.json b/release/7-6/ubi8/test-deps/meta.json
new file mode 100644
index 000000000..590284827
--- /dev/null
+++ b/release/7-6/ubi8/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 8",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "8"}
+    ],
+    "tagTemplates": [
+        "ubi-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 750
+    },
+    "DistributionState": "Validating",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-6/ubi9/docker/Dockerfile b/release/7-6/ubi9/docker/Dockerfile
new file mode 100644
index 000000000..04a96136c
--- /dev/null
+++ b/release/7-6/ubi9/docker/Dockerfile
@@ -0,0 +1,62 @@
+# syntax = docker/dockerfile:1.2
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+FROM registry.access.redhat.com/ubi9/ubi AS installer-env
+ARG PS_VERSION=7.3.0-preview.8
+ARG PACKAGE_VERSION=7.3.0_preview.8
+ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+
+# Install powershell
+# create folder at install location
+RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
+# start new stage so that the tar.gz layers are left behind in multi-stage build
+FROM registry.access.redhat.com/ubi9/ubi AS final-image
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    yum install -y \
+      less \
+      ncurses \
+      openssh-clients \
+      openssl \
+      glibc-locale-source \
+      glibc-langpack-en \
+      libicu \
+    && yum clean all
+RUN --mount=type=cache,target=/var/cache/yum,rw \
+    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
+    yum localinstall -y \
+      /mnt/rpm/linux.rpm \
+    && yum upgrade -y \
+    && yum clean all
+# Define ENVs for Localization/Globalization
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
+    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
+    # Fixed in https://github.com/dotnet/runtime/pull/69668
+    OPENSSL_ENABLE_SHA1_SIGNATURES=1
+
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh\
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+                    \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD ["pwsh-preview"]
diff --git a/release/7-6/ubi9/meta.json b/release/7-6/ubi9/meta.json
new file mode 100644
index 000000000..cf260a311
--- /dev/null
+++ b/release/7-6/ubi9/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
+    "SkipGssNtlmSspTests": true,
+    "osVersion": "Universal Base Image 9",
+    "ShortDistroName": "ubi",
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "manifestLists": [
+        "ubi${channelTagPostfix}",
+        "${channelTagPrefix}ubi"
+    ],
+    "SubImage": "test-deps",
+    "TestProperties": {
+        "size": 508
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-6/ubi9/test-deps/docker/Dockerfile b/release/7-6/ubi9/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..3ec04a1d8
--- /dev/null
+++ b/release/7-6/ubi9/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
+ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN yum install -y \
+        sudo \
+        wget \
+        hostname \
+        iputils \
+        procps-ng \
+        git \
+        unzip \
+    && yum clean all \
+    && yum upgrade -y \
+    && rm -rf /var/cache/yum
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubi9/test-deps/meta.json b/release/7-6/ubi9/test-deps/meta.json
new file mode 100644
index 000000000..a0efea4fd
--- /dev/null
+++ b/release/7-6/ubi9/test-deps/meta.json
@@ -0,0 +1,20 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Universal Base Image 9",
+    "SkipGssNtlmSspTests": true,
+    "shortTags": [
+        {"Tag": "9"}
+    ],
+    "tagTemplates": [
+        "ubi-#shorttag#"
+    ],
+    "OptionalTests": [
+        "test-deps"
+    ],
+    "TestProperties": {
+        "size": 566
+    },
+    "DistributionState": "ImageCreation",
+    "EndOfLife": "2023-05-30"
+}
diff --git a/release/7-6/ubuntu20.04-arm32v7/docker/Dockerfile b/release/7-6/ubuntu20.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..82537653b
--- /dev/null
+++ b/release/7-6/ubuntu20.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,65 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS installer-env
+
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+    ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+    ARG PS_INSTALL_VERSION=7-preview
+    # define the folder we will be installing PowerShell to
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+    # Create the install folder
+    RUN mkdir -p ${PS_INSTALL_FOLDER}
+    ARG PS_PACKAGE_URL_BASE64
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates wget --yes
+    RUN update-ca-certificates -f
+    RUN echo 'in task' \
+        && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+            echo 'using base64' \
+            && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+        else \
+            echo 'using unencoded' \
+            && export url="${PS_PACKAGE_URL}"; \
+        fi \
+        && echo "url: $url" \
+        && wget -O /tmp/powershell.tar.gz "$url" \
+        && echo 'task done'
+    RUN ls -l /tmp/powershell.tar.gz
+        # Unzip the Linux tar.gz
+    RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:focal AS final-image
+
+    # Define Args and Env needed to create links
+    ARG PS_INSTALL_VERSION=7-preview
+    ARG PS_VERSION=7.3.0-preview.3
+    ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+        \
+        # Define ENVs for Localization/Globalization
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+        LC_ALL=en_US.UTF-8 \
+        LANG=en_US.UTF-8 \
+        # set a fixed location for the Module analysis cache
+        PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+        POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-20.04
+    # Copy only the files we need from the previous stage
+    COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+    RUN --mount=type=cache,target=/var/lib/apt \
+        --mount=type=cache,target=/var/cache/apt \
+        apt-get update \
+        && apt-get install --no-install-recommends ca-certificates libssl1.1 libicu66 less --yes
+        # Give all user execute permissions and remove write permissions for others
+    RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+        # Create the pwsh symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+        # Create the pwsh-preview symbolic link that points to powershell
+        && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+    # Use PowerShell as the default shell
+    # Use array to avoid Docker prepending /bin/sh -c
+    CMD [ "pwsh" ]
diff --git a/release/7-6/ubuntu20.04-arm32v7/meta.json b/release/7-6/ubuntu20.04-arm32v7/meta.json
new file mode 100644
index 000000000..5e5d0ee14
--- /dev/null
+++ b/release/7-6/ubuntu20.04-arm32v7/meta.json
@@ -0,0 +1,22 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 20.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "focal-arm32"},
+        {"Tag": "20.04-arm32"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm32"
+}
diff --git a/release/7-6/ubuntu20.04/docker/Dockerfile b/release/7-6/ubuntu20.04/docker/Dockerfile
new file mode 100644
index 000000000..de0d3b08f
--- /dev/null
+++ b/release/7-6/ubuntu20.04/docker/Dockerfile
@@ -0,0 +1,97 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-20.04
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-6/ubuntu20.04/meta.json b/release/7-6/ubuntu20.04/meta.json
new file mode 100644
index 000000000..84124cdae
--- /dev/null
+++ b/release/7-6/ubuntu20.04/meta.json
@@ -0,0 +1,19 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "focal"},
+        {"Tag": "20.04"}
+    ],
+    "TestProperties": {
+        "size": 340
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated",
+    "UseInCi": false
+}
diff --git a/release/7-6/ubuntu20.04/test-deps/docker/Dockerfile b/release/7-6/ubuntu20.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..bf15fd900
--- /dev/null
+++ b/release/7-6/ubuntu20.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubuntu20.04/test-deps/meta.json b/release/7-6/ubuntu20.04/test-deps/meta.json
new file mode 100644
index 000000000..b3ecab356
--- /dev/null
+++ b/release/7-6/ubuntu20.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 410
+    }
+}
diff --git a/release/7-6/ubuntu22.04-arm32v7/docker/Dockerfile b/release/7-6/ubuntu22.04-arm32v7/docker/Dockerfile
new file mode 100644
index 000000000..01779bf8d
--- /dev/null
+++ b/release/7-6/ubuntu22.04-arm32v7/docker/Dockerfile
@@ -0,0 +1,62 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS installer-env
+
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
+ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+ARG PS_PACKAGE_URL_BASE64
+RUN apt-get update \
+    && apt-get install --no-install-recommends ca-certificates wget --yes
+RUN echo 'in task' \
+    && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \
+        echo 'using base64' \
+        && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\
+    else \
+        echo 'using unencoded' \
+        && export url="${PS_PACKAGE_URL}"; \
+    fi \
+    && echo "url: $url" \
+    && wget -O /tmp/powershell.tar.gz "$url" \
+    && echo 'task done'
+RUN ls -l /tmp/powershell.tar.gz
+    # Unzip the Linux tar.gz
+RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
+
+ARG hostRegistry=psdockercache.azurecr.io
+FROM --platform=linux/arm/v7 ${hostRegistry}/ubuntu:jammy AS final-image
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ARG PS_VERSION=7.3.0-preview.4
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm32v7-Ubuntu-22.04
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+RUN \
+  apt-get update \
+  && apt-get install --no-install-recommends ca-certificates libssl3 libicu70 less --yes
+    # Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubuntu22.04-arm32v7/meta.json b/release/7-6/ubuntu22.04-arm32v7/meta.json
new file mode 100644
index 000000000..e846f4518
--- /dev/null
+++ b/release/7-6/ubuntu22.04-arm32v7/meta.json
@@ -0,0 +1,25 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz",
+    "osVersion": "Ubuntu 22.04 ARM 32v7",
+    "SkipGssNtlmSspTests": true,
+    "ShortDistroName": "ubuntu",
+    "Base64EncodePackageUrl": true,
+    "UseAcr": false,
+    "shortTags": [
+        {"Tag": "jammy-arm32"},
+        {"Tag": "22.04-arm32"}
+    ],
+    "TestProperties": {
+        "size": 550,
+        "Arm32": true
+    },
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "EndOfLife": "2023-04-02",
+    "DistributionState": "Validated",
+    "UseInCi": false,
+    "Architecture": "arm32"
+}
diff --git a/release/7-6/ubuntu22.04/docker/Dockerfile b/release/7-6/ubuntu22.04/docker/Dockerfile
new file mode 100644
index 000000000..94ca415ee
--- /dev/null
+++ b/release/7-6/ubuntu22.04/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:22.04 AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.3.0-preview.8
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-22.04
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu70 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-6/ubuntu22.04/meta.json b/release/7-6/ubuntu22.04/meta.json
new file mode 100644
index 000000000..647fa3c84
--- /dev/null
+++ b/release/7-6/ubuntu22.04/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Ubuntu 22.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "jammy"},
+        {"Tag": "22.04"}
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "TestProperties": {
+        "size": 338
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-6/ubuntu22.04/test-deps/docker/Dockerfile b/release/7-6/ubuntu22.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..46f14f92a
--- /dev/null
+++ b/release/7-6/ubuntu22.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-22.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-22.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubuntu22.04/test-deps/meta.json b/release/7-6/ubuntu22.04/test-deps/meta.json
new file mode 100644
index 000000000..c488d53c1
--- /dev/null
+++ b/release/7-6/ubuntu22.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 22.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 390
+    }
+}
diff --git a/release/7-6/ubuntu24.04/docker/Dockerfile b/release/7-6/ubuntu24.04/docker/Dockerfile
new file mode 100644
index 000000000..0a84d34d7
--- /dev/null
+++ b/release/7-6/ubuntu24.04/docker/Dockerfile
@@ -0,0 +1,95 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:24.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+RUN --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # curl is required to grab the Linux package
+        curl \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+    # Download the Linux package and save it
+    && echo ${PS_PACKAGE_URL} \
+    && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb
+
+# Install the deb file in this image and make powershell available
+ARG hostRegistry=psdockercache.azurecr.io
+FROM ${hostRegistry}/ubuntu:24.04 AS final-image
+
+# # Define args needed to add the package
+ARG PS_VERSION=7.5.0-preview.5
+ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.deb_amd64.deb
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Ubuntu-24.04
+
+# Install dependencies and clean up
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+      apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu74 \
+        libssl3 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust1 \
+        libstdc++6 \
+        zlib1g \
+    # PowerShell remoting over SSH dependencies
+        openssh-client \
+    && apt-get dist-upgrade -y \
+    && locale-gen $LANG && update-locale \
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh-preview symbolic link that points to powershell
+    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]
diff --git a/release/7-6/ubuntu24.04/meta.json b/release/7-6/ubuntu24.04/meta.json
new file mode 100644
index 000000000..9d0e6ba61
--- /dev/null
+++ b/release/7-6/ubuntu24.04/meta.json
@@ -0,0 +1,22 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
+    "osVersion": "Ubuntu 24.04",
+    "SkipGssNtlmSspTests": false,
+    "ShortDistroName": "ubuntu",
+    "shortTags": [
+        {"Tag": "noble"},
+        {"Tag": "24.04"}
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "TestProperties": {
+        "size": 337
+    },
+    "SubImage": "test-deps",
+    "EndOfLife": "2029-04-01",
+    "DistributionState": "Validating",
+    "UseInCi": false
+}
diff --git a/release/7-6/ubuntu24.04/test-deps/docker/Dockerfile b/release/7-6/ubuntu24.04/test-deps/docker/Dockerfile
new file mode 100644
index 000000000..f048dd0e2
--- /dev/null
+++ b/release/7-6/ubuntu24.04/test-deps/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-24.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN --mount=type=cache,target=/var/lib/apt/lists \
+    apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+        git \
+        unzip \
+    && apt-get clean
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-24.04
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]
diff --git a/release/7-6/ubuntu24.04/test-deps/meta.json b/release/7-6/ubuntu24.04/test-deps/meta.json
new file mode 100644
index 000000000..9230901ed
--- /dev/null
+++ b/release/7-6/ubuntu24.04/test-deps/meta.json
@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 24.04",
+    "tagTemplates": [
+        "ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 390
+    }
+}
diff --git a/release/7-6/windowsserver2022/docker/Dockerfile b/release/7-6/windowsserver2022/docker/Dockerfile
new file mode 100644
index 000000000..88389cfe8
--- /dev/null
+++ b/release/7-6/windowsserver2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerRepo=windows/server
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServer
+FROM mcr.microsoft.com/${WindowsServerRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServer-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-6/windowsserver2022/meta.json b/release/7-6/windowsserver2022/meta.json
new file mode 100644
index 000000000..de7049fef
--- /dev/null
+++ b/release/7-6/windowsserver2022/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "Base64EncodePackageUrl": true,
+    "ShortDistroName": "windowsserver",
+    "manifestLists": [
+        "${channelTagPrefix}windowsserver"
+    ],
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/release/7-6/windowsservercore2022/docker/Dockerfile b/release/7-6/windowsservercore2022/docker/Dockerfile
new file mode 100644
index 000000000..1a165d3e0
--- /dev/null
+++ b/release/7-6/windowsservercore2022/docker/Dockerfile
@@ -0,0 +1,72 @@
+# escape=`
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+ARG dockerHost=mcr.microsoft.com
+ARG WindowsServerCoreRepo=windows/servercore
+ARG tag=ltsc2022
+
+# Use server core as an installer container to extract PowerShell,
+# As this is a multi-stage build, this stage will eventually be thrown away
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
+
+ARG PS_VERSION=6.2.0
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip
+
+SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+
+ARG PS_PACKAGE_URL_BASE64
+
+RUN Write-host "Verifying valid Version..."; `
+    if (!($env:PS_VERSION -match '^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$' )) { `
+        throw ('PS_Version ({0}) must match the regex "^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$"' -f $env:PS_VERSION) `
+    } `
+    $ProgressPreference = 'SilentlyContinue'; `
+    if($env:PS_PACKAGE_URL_BASE64){ `
+        Write-host "decoding: $env:PS_PACKAGE_URL_BASE64" ;`
+        $url = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String($env:PS_PACKAGE_URL_BASE64)) `
+    } else { `
+        Write-host "using url: $env:PS_PACKAGE_URL" ;`
+        $url = $env:PS_PACKAGE_URL `
+    } `
+    Write-host "downloading: $url"; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -Uri $url -outfile /powershell.zip -verbose; `
+    Expand-Archive powershell.zip -DestinationPath  \PowerShell
+
+# Install PowerShell into WindowsServerCore
+FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
+
+# Copy PowerShell Core from the installer container
+ENV ProgramFiles="C:\Program Files" `
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath="C:\Users\Public\AppData\Local\Microsoft\Windows\PowerShell\docker\ModuleAnalysisCache" `
+    # Persist %PSCORE% ENV variable for user convenience
+    PSCORE="$ProgramFiles\PowerShell\pwsh.exe" `
+    POWERSHELL_DISTRIBUTION_CHANNEL="PSDocker-WindowsServerCore-ltsc2022" `
+    POWERSHELL_TELEMETRY_OPTOUT="1"
+
+# Copy PowerShell Core from the installer container
+COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
+
+# Set the path
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
+
+# intialize powershell module cache
+RUN pwsh `
+        -NoLogo `
+        -NoProfile `
+        -Command " `
+          $stopTime = (get-date).AddMinutes(15); `
+          $ErrorActionPreference = 'Stop' ; `
+          $ProgressPreference = 'SilentlyContinue' ; `
+          while(!(Test-Path -Path $env:PSModuleAnalysisCachePath)) {  `
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; `
+            if((get-date) -gt $stopTime) { throw 'timout expired'} `
+            Start-Sleep -Seconds 6 ; `
+          }"
+
+# re-enable telemetry
+ENV POWERSHELL_TELEMETRY_OPTOUT="0"
+
+CMD ["pwsh.exe"]
diff --git a/release/7-6/windowsservercore2022/meta.json b/release/7-6/windowsservercore2022/meta.json
new file mode 100644
index 000000000..a1b9c11ce
--- /dev/null
+++ b/release/7-6/windowsservercore2022/meta.json
@@ -0,0 +1,21 @@
+{
+    "IsLinux": false,
+    "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
+    "osVersion": "Windows Server Core, LTSC 2022",
+    "shortTags": [
+        {
+            "Tag": "ltsc2022"
+        }
+    ],
+    "manifestLists": [
+        "${channelTag}"
+    ],
+    "Base64EncodePackageUrl": true,
+    "ShortDistroName": "windowsservercore",
+    "TestProperties": {
+        "size": 1
+    },
+    "UseAcr": true,
+    "EndOfLife": "2023-12-15",
+    "DistributionState": "Validated"
+}
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index 12a3997b8..d134eaf19 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -7,7 +7,7 @@
     },
     {
         "name": "preview",
-        "path": "release/7-5",
+        "path": "release/7-6",
         "tagPrefix": "preview",
         "pwshInstallVersion": "7-preview",
         "packageTag": "-preview"

From 0fb2522cf3b47ec263ba92103ffa8a62218fee31 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 16 Jan 2025 17:07:27 -0500
Subject: [PATCH 349/354] Update build yamls for new preview version (#843)

---
 .pipelines/PowerShell-Docker-Image-Build-Official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
index a90dd7b56..bed46018a 100644
--- a/.pipelines/PowerShell-Docker-Image-Build-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -145,7 +145,7 @@ extends:
       - template: /.vsts-ci/previewReleaseStage.yml@self
         parameters:
           channel: ${{ parameters.releaseChannel }}
-          channelPath: 'release/7-5'
+          channelPath: 'release/7-6'
     - ${{ if eq(parameters.releaseChannel, 'lts') }}:
       - template: /.vsts-ci/ltsReleaseStage.yml@self
         parameters:

From 924d12e7307a303b858bd2e83b8d3158c38435a4 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Fri, 17 Jan 2025 18:10:57 -0500
Subject: [PATCH 350/354] Remove ubi images (#844)

---
 .vsts-ci/previewReleaseStage.yml             | 20 -------
 release/7-5/ubi8/docker/Dockerfile           | 59 -------------------
 release/7-5/ubi8/meta.json                   | 17 ------
 release/7-5/ubi8/test-deps/docker/Dockerfile | 23 --------
 release/7-5/ubi8/test-deps/meta.json         | 20 -------
 release/7-5/ubi9/docker/Dockerfile           | 62 --------------------
 release/7-5/ubi9/meta.json                   | 21 -------
 release/7-5/ubi9/test-deps/docker/Dockerfile | 23 --------
 release/7-5/ubi9/test-deps/meta.json         | 20 -------
 release/7-6/ubi8/docker/Dockerfile           | 59 -------------------
 release/7-6/ubi8/meta.json                   | 17 ------
 release/7-6/ubi8/test-deps/docker/Dockerfile | 23 --------
 release/7-6/ubi8/test-deps/meta.json         | 20 -------
 release/7-6/ubi9/docker/Dockerfile           | 62 --------------------
 release/7-6/ubi9/meta.json                   | 21 -------
 release/7-6/ubi9/test-deps/docker/Dockerfile | 23 --------
 release/7-6/ubi9/test-deps/meta.json         | 20 -------
 17 files changed, 510 deletions(-)
 delete mode 100644 release/7-5/ubi8/docker/Dockerfile
 delete mode 100644 release/7-5/ubi8/meta.json
 delete mode 100644 release/7-5/ubi8/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/ubi8/test-deps/meta.json
 delete mode 100644 release/7-5/ubi9/docker/Dockerfile
 delete mode 100644 release/7-5/ubi9/meta.json
 delete mode 100644 release/7-5/ubi9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-5/ubi9/test-deps/meta.json
 delete mode 100644 release/7-6/ubi8/docker/Dockerfile
 delete mode 100644 release/7-6/ubi8/meta.json
 delete mode 100644 release/7-6/ubi8/test-deps/docker/Dockerfile
 delete mode 100644 release/7-6/ubi8/test-deps/meta.json
 delete mode 100644 release/7-6/ubi9/docker/Dockerfile
 delete mode 100644 release/7-6/ubi9/meta.json
 delete mode 100644 release/7-6/ubi9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-6/ubi9/test-deps/meta.json

diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
index 6e9020582..455a48a8c 100644
--- a/.vsts-ci/previewReleaseStage.yml
+++ b/.vsts-ci/previewReleaseStage.yml
@@ -60,26 +60,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8
-      artifactSuffix: ubi8
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9
-      artifactSuffix: ubi9
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
diff --git a/release/7-5/ubi8/docker/Dockerfile b/release/7-5/ubi8/docker/Dockerfile
deleted file mode 100644
index 8bfa52029..000000000
--- a/release/7-5/ubi8/docker/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    # ubi 8 security updates are not marked as security updates.
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-5/ubi8/meta.json b/release/7-5/ubi8/meta.json
deleted file mode 100644
index bc5a6587c..000000000
--- a/release/7-5/ubi8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 700
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-5/ubi8/test-deps/docker/Dockerfile b/release/7-5/ubi8/test-deps/docker/Dockerfile
deleted file mode 100644
index c4df646c2..000000000
--- a/release/7-5/ubi8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/ubi8/test-deps/meta.json b/release/7-5/ubi8/test-deps/meta.json
deleted file mode 100644
index 590284827..000000000
--- a/release/7-5/ubi8/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-5/ubi9/docker/Dockerfile b/release/7-5/ubi9/docker/Dockerfile
deleted file mode 100644
index 04a96136c..000000000
--- a/release/7-5/ubi9/docker/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi9/ubi AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi9/ubi AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      openssl \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
-    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
-    # Fixed in https://github.com/dotnet/runtime/pull/69668
-    OPENSSL_ENABLE_SHA1_SIGNATURES=1
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-5/ubi9/meta.json b/release/7-5/ubi9/meta.json
deleted file mode 100644
index cf260a311..000000000
--- a/release/7-5/ubi9/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 9",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "manifestLists": [
-        "ubi${channelTagPostfix}",
-        "${channelTagPrefix}ubi"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 508
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-5/ubi9/test-deps/docker/Dockerfile b/release/7-5/ubi9/test-deps/docker/Dockerfile
deleted file mode 100644
index 3ec04a1d8..000000000
--- a/release/7-5/ubi9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && yum upgrade -y \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-5/ubi9/test-deps/meta.json b/release/7-5/ubi9/test-deps/meta.json
deleted file mode 100644
index a0efea4fd..000000000
--- a/release/7-5/ubi9/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 9",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 566
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-6/ubi8/docker/Dockerfile b/release/7-6/ubi8/docker/Dockerfile
deleted file mode 100644
index 8bfa52029..000000000
--- a/release/7-6/ubi8/docker/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    # ubi 8 security updates are not marked as security updates.
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-6/ubi8/meta.json b/release/7-6/ubi8/meta.json
deleted file mode 100644
index bc5a6587c..000000000
--- a/release/7-6/ubi8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 700
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-6/ubi8/test-deps/docker/Dockerfile b/release/7-6/ubi8/test-deps/docker/Dockerfile
deleted file mode 100644
index c4df646c2..000000000
--- a/release/7-6/ubi8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-6/ubi8/test-deps/meta.json b/release/7-6/ubi8/test-deps/meta.json
deleted file mode 100644
index 590284827..000000000
--- a/release/7-6/ubi8/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-6/ubi9/docker/Dockerfile b/release/7-6/ubi9/docker/Dockerfile
deleted file mode 100644
index 04a96136c..000000000
--- a/release/7-6/ubi9/docker/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi9/ubi AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi9/ubi AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      openssl \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
-    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
-    # Fixed in https://github.com/dotnet/runtime/pull/69668
-    OPENSSL_ENABLE_SHA1_SIGNATURES=1
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-6/ubi9/meta.json b/release/7-6/ubi9/meta.json
deleted file mode 100644
index cf260a311..000000000
--- a/release/7-6/ubi9/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 9",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "manifestLists": [
-        "ubi${channelTagPostfix}",
-        "${channelTagPrefix}ubi"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 508
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-6/ubi9/test-deps/docker/Dockerfile b/release/7-6/ubi9/test-deps/docker/Dockerfile
deleted file mode 100644
index 3ec04a1d8..000000000
--- a/release/7-6/ubi9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && yum upgrade -y \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-6/ubi9/test-deps/meta.json b/release/7-6/ubi9/test-deps/meta.json
deleted file mode 100644
index a0efea4fd..000000000
--- a/release/7-6/ubi9/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 9",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 566
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}

From ea027b7d8c6a10ac47a3210410c394553e0495ec Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 27 Jan 2025 17:55:49 -0500
Subject: [PATCH 351/354] update build yamls (#846)

---
 ...PowerShell-Docker-Image-Build-Official.yml |  4 +-
 .vsts-ci/ltsReleaseStage.yml                  | 54 ++++++++++------
 .vsts-ci/stableReleaseStage.yml               | 22 ++-----
 release/7-4/ubi8/docker/Dockerfile            | 59 ------------------
 release/7-4/ubi8/meta.json                    | 17 -----
 release/7-4/ubi8/test-deps/docker/Dockerfile  | 23 -------
 release/7-4/ubi8/test-deps/meta.json          | 20 ------
 release/7-4/ubi9/docker/Dockerfile            | 62 -------------------
 release/7-4/ubi9/meta.json                    | 21 -------
 release/7-4/ubi9/test-deps/docker/Dockerfile  | 23 -------
 release/7-4/ubi9/test-deps/meta.json          | 20 ------
 tools/buildHelper/channels.json               |  4 +-
 12 files changed, 46 insertions(+), 283 deletions(-)
 delete mode 100644 release/7-4/ubi8/docker/Dockerfile
 delete mode 100644 release/7-4/ubi8/meta.json
 delete mode 100644 release/7-4/ubi8/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/ubi8/test-deps/meta.json
 delete mode 100644 release/7-4/ubi9/docker/Dockerfile
 delete mode 100644 release/7-4/ubi9/meta.json
 delete mode 100644 release/7-4/ubi9/test-deps/docker/Dockerfile
 delete mode 100644 release/7-4/ubi9/test-deps/meta.json

diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
index bed46018a..2272dba3c 100644
--- a/.pipelines/PowerShell-Docker-Image-Build-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -140,7 +140,7 @@ extends:
       - template: /.vsts-ci/stableReleaseStage.yml@self
         parameters:
           channel: ${{ parameters.releaseChannel }}
-          channelPath: 'release/7-4'
+          channelPath: 'release/7-5'
     - ${{ if eq(parameters.releaseChannel, 'preview') }}:
       - template: /.vsts-ci/previewReleaseStage.yml@self
         parameters:
@@ -150,4 +150,4 @@ extends:
       - template: /.vsts-ci/ltsReleaseStage.yml@self
         parameters:
           channel: ${{ parameters.releaseChannel }}
-          channelPath: 'release/7-2'
+          channelPath: 'release/7-4'
diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
index b679968a2..2426dac29 100644
--- a/.vsts-ci/ltsReleaseStage.yml
+++ b/.vsts-ci/ltsReleaseStage.yml
@@ -23,8 +23,28 @@ stages:
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
-      imageName: mariner2
-      artifactSuffix: mariner2
+      imageName: alpine320
+      artifactSuffix: alpine320
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: azurelinux3
+      artifactSuffix: azurelinux3
+      poolOS: 'linux'
+      poolHostArchitecture: 'amd64'
+      buildKitValue: 1
+      channel: ${{ parameters.channel }}
+      channelPath: ${{ parameters.channelPath }}
+  - template: /.vsts-ci/releaseJob.yml@self
+    parameters:
+      archName: 'Build_linux_amd64'
+      imageName: debian12
+      artifactSuffix: debian12
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -33,8 +53,8 @@ stages:
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
-      imageName: ubi8
-      artifactSuffix: ubi8
+      imageName: mariner2
+      artifactSuffix: mariner2
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -82,24 +102,22 @@ stages:
       channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
-      archName: 'Build_windows_amd64'
-      imageName: nanoserver1809
-      artifactSuffix: nanoserver1809
-      poolOS: 'windows'
-      poolHostVersion: '1ESWindows2022'
-      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
-      maxParallel: 3
+      archName: 'Build_linux_arm64'
+      imageName: azurelinux3-arm64
+      artifactSuffix: azurelinux3_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
-      archName: 'Build_windows_amd64'
-      imageName: nanoserver2022
-      artifactSuffix: nanoserver2022
-      poolOS: 'windows'
-      poolHostVersion: '1ESWindows2022'
-      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
-      maxParallel: 3
+      archName: 'Build_linux_arm64'
+      imageName: mariner2-arm64
+      artifactSuffix: mariner2_arm64
+      poolOS: 'linux'
+      poolHostArchitecture: 'arm64'
+      buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
index 7f03bfc03..a308856b3 100644
--- a/.vsts-ci/stableReleaseStage.yml
+++ b/.vsts-ci/stableReleaseStage.yml
@@ -63,18 +63,8 @@ stages:
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
-      imageName: ubi8
-      artifactSuffix: ubi8
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9
-      artifactSuffix: ubi9
+      imageName: ubuntu20.04
+      artifactSuffix: ubuntu2004
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -83,8 +73,8 @@ stages:
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04
-      artifactSuffix: ubuntu2004
+      imageName: ubuntu22.04
+      artifactSuffix: ubuntu2204
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
@@ -93,8 +83,8 @@ stages:
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04
-      artifactSuffix: ubuntu2204
+      imageName: ubuntu24.04
+      artifactSuffix: ubuntu2404
       poolOS: 'linux'
       poolHostArchitecture: 'amd64'
       buildKitValue: 1
diff --git a/release/7-4/ubi8/docker/Dockerfile b/release/7-4/ubi8/docker/Dockerfile
deleted file mode 100644
index 8bfa52029..000000000
--- a/release/7-4/ubi8/docker/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi8/ubi:8.6 AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    # ubi 8 security updates are not marked as security updates.
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-8.4
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-4/ubi8/meta.json b/release/7-4/ubi8/meta.json
deleted file mode 100644
index 9639070ce..000000000
--- a/release/7-4/ubi8/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 8",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 625
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-4/ubi8/test-deps/docker/Dockerfile b/release/7-4/ubi8/test-deps/docker/Dockerfile
deleted file mode 100644
index c4df646c2..000000000
--- a/release/7-4/ubi8/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-8.4
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        openssl \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-8.4
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/ubi8/test-deps/meta.json b/release/7-4/ubi8/test-deps/meta.json
deleted file mode 100644
index 590284827..000000000
--- a/release/7-4/ubi8/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 8",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "8"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 750
-    },
-    "DistributionState": "Validating",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-4/ubi9/docker/Dockerfile b/release/7-4/ubi9/docker/Dockerfile
deleted file mode 100644
index 04a96136c..000000000
--- a/release/7-4/ubi9/docker/Dockerfile
+++ /dev/null
@@ -1,62 +0,0 @@
-# syntax = docker/dockerfile:1.2
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-FROM registry.access.redhat.com/ubi9/ubi AS installer-env
-ARG PS_VERSION=7.3.0-preview.8
-ARG PACKAGE_VERSION=7.3.0_preview.8
-ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rh.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-
-# Install powershell
-# create folder at install location
-RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/linux.rpm
-# start new stage so that the tar.gz layers are left behind in multi-stage build
-FROM registry.access.redhat.com/ubi9/ubi AS final-image
-ARG PS_VERSION=7.3.0-preview.8
-ARG PS_INSTALL_VERSION=7-preview
-
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    yum install -y \
-      less \
-      ncurses \
-      openssh-clients \
-      openssl \
-      glibc-locale-source \
-      glibc-langpack-en \
-      libicu \
-    && yum clean all
-RUN --mount=type=cache,target=/var/cache/yum,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    yum localinstall -y \
-      /mnt/rpm/linux.rpm \
-    && yum upgrade -y \
-    && yum clean all
-# Define ENVs for Localization/Globalization
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
-    LC_ALL=en_US.UTF-8 \
-    LANG=en_US.UTF-8 \
-    # set a fixed location for the Module analysis cache
-    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-UBI-9 \
-    # Needed to talk to many sites, see:  https://github.com/dotnet/runtime/issues/65874
-    # Fixed in https://github.com/dotnet/runtime/pull/69668
-    OPENSSL_ENABLE_SHA1_SIGNATURES=1
-
-RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG \
-    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
-    && ln -sf ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
-    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
-    && pwsh\
-        -NoLogo \
-        -NoProfile \
-        -Command " \
-                    \$ErrorActionPreference = 'Stop' ; \
-          \$ProgressPreference = 'SilentlyContinue' ; \
-          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
-            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
-            Start-Sleep -Seconds 6 ; \
-          }"
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD ["pwsh-preview"]
diff --git a/release/7-4/ubi9/meta.json b/release/7-4/ubi9/meta.json
deleted file mode 100644
index cf260a311..000000000
--- a/release/7-4/ubi9/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.rh.x86_64.rpm",
-    "SkipGssNtlmSspTests": true,
-    "osVersion": "Universal Base Image 9",
-    "ShortDistroName": "ubi",
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "manifestLists": [
-        "ubi${channelTagPostfix}",
-        "${channelTagPrefix}ubi"
-    ],
-    "SubImage": "test-deps",
-    "TestProperties": {
-        "size": 508
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/release/7-4/ubi9/test-deps/docker/Dockerfile b/release/7-4/ubi9/test-deps/docker/Dockerfile
deleted file mode 100644
index 3ec04a1d8..000000000
--- a/release/7-4/ubi9/test-deps/docker/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG BaseImage=mcr.microsoft.com/powershell:ubi-9
-
-FROM ${BaseImage}
-
-# Install dependencies and clean up
-RUN yum install -y \
-        sudo \
-        wget \
-        hostname \
-        iputils \
-        procps-ng \
-        git \
-        unzip \
-    && yum clean all \
-    && yum upgrade -y \
-    && rm -rf /var/cache/yum
-
-ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-ubi-9
-
-# Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
-CMD [ "pwsh" ]
diff --git a/release/7-4/ubi9/test-deps/meta.json b/release/7-4/ubi9/test-deps/meta.json
deleted file mode 100644
index a0efea4fd..000000000
--- a/release/7-4/ubi9/test-deps/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "IsLinux" : true,
-    "UseLinuxVersion": false,
-    "osVersion": "Universal Base Image 9",
-    "SkipGssNtlmSspTests": true,
-    "shortTags": [
-        {"Tag": "9"}
-    ],
-    "tagTemplates": [
-        "ubi-#shorttag#"
-    ],
-    "OptionalTests": [
-        "test-deps"
-    ],
-    "TestProperties": {
-        "size": 566
-    },
-    "DistributionState": "ImageCreation",
-    "EndOfLife": "2023-05-30"
-}
diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json
index d134eaf19..b9abed435 100644
--- a/tools/buildHelper/channels.json
+++ b/tools/buildHelper/channels.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "stable",
-        "path": "release/7-4",
+        "path": "release/7-5",
         "pwshInstallVersion": "7",
         "packageTag": ""
     },
@@ -14,7 +14,7 @@
     },
     {
         "name": "lts",
-        "path": "release/7-2",
+        "path": "release/7-4",
         "tagPrefix": "lts",
         "pwshInstallVersion": "7-lts",
         "packageTag": "-lts"

From 645a63decc1c83d4ed94875f53b1ad5bb3d7be71 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 27 Feb 2025 17:05:59 -0500
Subject: [PATCH 352/354] Increase expected size of Ubuntu 24.0 preview image
 for size test (#848)

---
 release/7-5/ubuntu24.04/meta.json | 2 +-
 release/7-6/ubuntu24.04/meta.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/7-5/ubuntu24.04/meta.json b/release/7-5/ubuntu24.04/meta.json
index 9d0e6ba61..caf3d6134 100644
--- a/release/7-5/ubuntu24.04/meta.json
+++ b/release/7-5/ubuntu24.04/meta.json
@@ -13,7 +13,7 @@
         "${channelTag}"
     ],
     "TestProperties": {
-        "size": 337
+        "size": 370
     },
     "SubImage": "test-deps",
     "EndOfLife": "2029-04-01",
diff --git a/release/7-6/ubuntu24.04/meta.json b/release/7-6/ubuntu24.04/meta.json
index 9d0e6ba61..caf3d6134 100644
--- a/release/7-6/ubuntu24.04/meta.json
+++ b/release/7-6/ubuntu24.04/meta.json
@@ -13,7 +13,7 @@
         "${channelTag}"
     ],
     "TestProperties": {
-        "size": 337
+        "size": 370
     },
     "SubImage": "test-deps",
     "EndOfLife": "2029-04-01",

From 37b03a542eb3436b52f5d904b1f60ff73a13231a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 27 Feb 2025 14:54:06 -0800
Subject: [PATCH 353/354] Update scorecard.yml (#850)

* Update scorecard.yml

* Update .github/workflows/scorecard.yml
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ef6b0168a..c1ae3ccac 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -61,7 +61,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: SARIF file
           path: results.sarif

From c074f9414e564cf3d35ac256f0e4219d6f4e6f02 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Thu, 27 Feb 2025 18:13:20 -0500
Subject: [PATCH 354/354] Add release/* branches to branches that can trigger
 release pipeline (#849)

---
 .pipelines/PowerShell-Docker-Image-Release-Official.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/PowerShell-Docker-Image-Release-Official.yml b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
index 2561ef36d..c3498c8be 100644
--- a/.pipelines/PowerShell-Docker-Image-Release-Official.yml
+++ b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
@@ -10,7 +10,7 @@ resources:
         include:
         - master
         - master-ado
-        - onebranchbuild
+        - release/*
 
   repositories:
   - repository: onebranchTemplates