From 5a74642eaba226aed28de70aa2a9da5f2d61a2a5 Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Tue, 4 Feb 2020 13:34:46 -0600
Subject: [PATCH 01/24] Updated maven from 3.6.2 to 3.6.3

---
 images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1
index 7b8cdd135..68c0209fd 100644
--- a/images/win/scripts/Installers/Install-JavaTools.ps1
+++ b/images/win/scripts/Installers/Install-JavaTools.ps1
@@ -62,7 +62,7 @@ setx JAVA_HOME_11_X64 $latestJava11Install /M
 # Install Java tools
 # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK
 choco install ant -y -i
-choco install maven -y -i --version=3.6.2
+choco install maven -y -i --version=3.6.3
 choco install gradle -y
 
 # Move maven variables to Machine. They may not be in the environment for this script so we need to read them from the registry.

From b98eec89d4711feb96541bd67fa45cd79e55d180 Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Sun, 9 Feb 2020 19:37:43 +0100
Subject: [PATCH 02/24] Add Julia 1.3.1

---
 images/linux/scripts/installers/julia.sh      | 50 +++++++++++++++
 .../win/scripts/Installers/Install-Julia.ps1  | 62 +++++++++++++++++++
 .../win/scripts/Installers/Validate-Julia.ps1 | 49 +++++++++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 images/linux/scripts/installers/julia.sh
 create mode 100644 images/win/scripts/Installers/Install-Julia.ps1
 create mode 100644 images/win/scripts/Installers/Validate-Julia.ps1

diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh
new file mode 100644
index 000000000..849ff8f29
--- /dev/null
+++ b/images/linux/scripts/installers/julia.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+################################################################################
+##  File:  julia.sh
+##  Desc:  Installs Julia, and adds Julia to the path
+################################################################################
+
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
+# This function installs Julia using the specified arguments:
+#   $1=MajorVersion (1.3)
+#   $2=MajorAndMinorVersion (1.3.1)
+#   $3=IsDefaultVersion (true or false)
+
+function InstallJulia () {
+    curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$1/julia-$2-linux-x86_64.tar.gz" -o "julia-$2-linux-x86_64.tar.gz"
+    mkdir -p "/usr/local/julia$1"
+    tar -C "/usr/local/julia$1" -xzf "julia-$2-linux-x86_64.tar.gz" --strip-components=1 julia
+    rm "julia-$2-linux-x86_64.tar.gz"
+
+    # If this version of Julia is to be the default version,
+    # symlink it into the path
+    if [ "$3" = true ]; then
+        ln -s "/usr/local/julia$1/bin/julia" /usr/bin/julia
+    fi
+
+    # Run tests to determine that the software installed as expected
+    echo "Testing to make sure that script performed as expected, and basic scenarios work"
+
+    # If this version of Julia is to be the default version,
+    # check that it has been added to PATH
+    if [ "$3" = true ]; then
+        if ! command -v julia; then
+            echo "Julia was not installed or found on PATH"
+            exit 1
+        fi
+    fi
+
+    # Verify output of julia --version
+    if [ ! "$(/usr/local/julia"$1"/bin/julia --version)" = "julia version $2" ]; then
+        echo "Julia was not installed correctly"
+        exit 1
+    fi
+
+    # Document what was added to the image
+    echo "Lastly, documenting what we added to the metadata file"
+    DocumentInstalledItem "Julia ($(julia --version))"
+}
+
+InstallJulia 1.3 1.3.1 true
diff --git a/images/win/scripts/Installers/Install-Julia.ps1 b/images/win/scripts/Installers/Install-Julia.ps1
new file mode 100644
index 000000000..cde01e691
--- /dev/null
+++ b/images/win/scripts/Installers/Install-Julia.ps1
@@ -0,0 +1,62 @@
+################################################################################
+##  File:  Install-Julia.ps1
+##  Desc:  Install Julia
+################################################################################
+
+Import-Module -Name ImageHelpers -Force
+function Install-JuliaVersion
+{
+    Param
+    (
+        [String]$juliaVersion,
+        [Switch]$addToDefaultPath
+    )
+
+    # Split versions.
+    $juliaMajorVersion = $juliaVersion.split(".")[0] + "." + $juliaVersion.split(".")[1]
+
+    # Download the Julia installer.
+    Write-Host "Downloading Julia $juliaVersion..."
+    $ProgressPreference = 'SilentlyContinue'
+    Invoke-WebRequest -UseBasicParsing -Uri "https://julialang-s3.julialang.org/bin/winnt/x64/$juliaMajorVersion/julia-$juliaVersion-win64.exe" -OutFile "julia-$juliaVersion-win64.exe"
+
+    # Install Julia.
+    # The installer will change in Julia 1.4. For future-proofing, a version check is run.
+    if ( $juliaMajorVersion -ge "1.4")
+    {
+        Start-Process -FilePath "julia-$juliaVersion-win64.exe" -ArgumentList "/SILENT /dir=C:\Julia" -NoNewWindow -Wait
+    }
+    else
+    {
+        Start-Process -FilePath "julia-$juliaVersion-win64.exe" -ArgumentList "/S /D=C:\Julia" -NoNewWindow -Wait
+    }
+
+    # Delete unnecessary files to conserve space.
+    Write-Host "Deleting downloaded installer..."
+    Remove-Item "julia-$juliaVersion-win64.exe"
+
+    # Make this the default version of Julia?
+    if ($addToDefaultPath)
+    {
+        Write-Host "Adding Julia $juliaVersion to the path..."
+        # Add the Julia binaries to the path.
+        Add-MachinePathItem "C:\Julia\Julia-$juliaVersion\bin" | Out-Null
+    }
+
+    # Done
+    Write-Host "Done installing Julia $juliaVersion."
+    return "C:\Julia\Julia-$juliaVersion"
+}
+
+# Install Julia
+$juliaVersionsToInstall = $env:JULIA_VERSIONS.split(",")
+
+foreach($julia in $juliaVersionsToInstall) {
+    Write-Host "Installing Julia ${julia}"
+    if($julia -eq $env:JULIA_DEFAULT) {
+        $installDirectory = Install-JuliaVersion -juliaVersion $julia -addToDefaultPath
+    } else {
+        $installDirectory = Install-JuliaVersion -juliaVersion $julia
+    }
+    setx $envName "$installDirectory" /M
+}
diff --git a/images/win/scripts/Installers/Validate-Julia.ps1 b/images/win/scripts/Installers/Validate-Julia.ps1
new file mode 100644
index 000000000..e3c8973cc
--- /dev/null
+++ b/images/win/scripts/Installers/Validate-Julia.ps1
@@ -0,0 +1,49 @@
+################################################################################
+##  File:  Validate-Julia.ps1
+##  Desc:  Validate Julia
+################################################################################
+
+# Verify that julia.exe is on the path
+if(Get-Command -Name 'julia')
+{
+    Write-Host "$(julia --version) is on the path."
+}
+else
+{
+    Write-Host "Julia is not on the path."
+    exit 1
+}
+
+# Add details of available versions in Markdown
+$tmplMark = @"
+#### {0}
+
+_Environment:_
+* {1}: root directory of the Julia {0} installation
+
+"@
+
+$tmplMarkRoot = @"
+#### {0}
+
+_Environment:_
+* PATH: contains the location of julia.exe version {0}
+* {1}: root directory of the Julia {0} installation
+"@
+
+$SoftwareName = "Julia (x64)"
+$Description = New-Object System.Text.StringBuilder
+$juliaVersionsToInstall = $env:JULIA_VERSIONS.split(",")
+
+foreach($julia in $juliaVersionsToInstall) {
+    $juliaVersion = Get-JuliaVersion
+    if ($juliaVersion -eq $julia) {
+        if($julia -eq $env:JULIA_DEFAULT) {
+            $null = $Description.AppendLine(($tmplMarkRoot -f $juliaVersion))
+        } else {
+            $null = $Description.AppendLine(($tmplMark -f $juliaVersion))
+        }
+    }
+}
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description.ToString()

From dd2c76c8a3a1f2d8cde5f4cdfbc40549c2576843 Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Tue, 11 Feb 2020 13:28:38 +0100
Subject: [PATCH 03/24] Use choco to install Julia

---
 .../win/scripts/Installers/Install-Julia.ps1  | 58 +------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Julia.ps1 b/images/win/scripts/Installers/Install-Julia.ps1
index cde01e691..0090d5304 100644
--- a/images/win/scripts/Installers/Install-Julia.ps1
+++ b/images/win/scripts/Installers/Install-Julia.ps1
@@ -3,60 +3,4 @@
 ##  Desc:  Install Julia
 ################################################################################
 
-Import-Module -Name ImageHelpers -Force
-function Install-JuliaVersion
-{
-    Param
-    (
-        [String]$juliaVersion,
-        [Switch]$addToDefaultPath
-    )
-
-    # Split versions.
-    $juliaMajorVersion = $juliaVersion.split(".")[0] + "." + $juliaVersion.split(".")[1]
-
-    # Download the Julia installer.
-    Write-Host "Downloading Julia $juliaVersion..."
-    $ProgressPreference = 'SilentlyContinue'
-    Invoke-WebRequest -UseBasicParsing -Uri "https://julialang-s3.julialang.org/bin/winnt/x64/$juliaMajorVersion/julia-$juliaVersion-win64.exe" -OutFile "julia-$juliaVersion-win64.exe"
-
-    # Install Julia.
-    # The installer will change in Julia 1.4. For future-proofing, a version check is run.
-    if ( $juliaMajorVersion -ge "1.4")
-    {
-        Start-Process -FilePath "julia-$juliaVersion-win64.exe" -ArgumentList "/SILENT /dir=C:\Julia" -NoNewWindow -Wait
-    }
-    else
-    {
-        Start-Process -FilePath "julia-$juliaVersion-win64.exe" -ArgumentList "/S /D=C:\Julia" -NoNewWindow -Wait
-    }
-
-    # Delete unnecessary files to conserve space.
-    Write-Host "Deleting downloaded installer..."
-    Remove-Item "julia-$juliaVersion-win64.exe"
-
-    # Make this the default version of Julia?
-    if ($addToDefaultPath)
-    {
-        Write-Host "Adding Julia $juliaVersion to the path..."
-        # Add the Julia binaries to the path.
-        Add-MachinePathItem "C:\Julia\Julia-$juliaVersion\bin" | Out-Null
-    }
-
-    # Done
-    Write-Host "Done installing Julia $juliaVersion."
-    return "C:\Julia\Julia-$juliaVersion"
-}
-
-# Install Julia
-$juliaVersionsToInstall = $env:JULIA_VERSIONS.split(",")
-
-foreach($julia in $juliaVersionsToInstall) {
-    Write-Host "Installing Julia ${julia}"
-    if($julia -eq $env:JULIA_DEFAULT) {
-        $installDirectory = Install-JuliaVersion -juliaVersion $julia -addToDefaultPath
-    } else {
-        $installDirectory = Install-JuliaVersion -juliaVersion $julia
-    }
-    setx $envName "$installDirectory" /M
-}
+choco install julia -y

From b6d99efb99160747a93761607c77e57fa1dd3d25 Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Tue, 11 Feb 2020 13:35:42 +0100
Subject: [PATCH 04/24] Simplify Validate-Julia.ps1 script

---
 .../win/scripts/Installers/Validate-Julia.ps1 | 36 ++++---------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/images/win/scripts/Installers/Validate-Julia.ps1 b/images/win/scripts/Installers/Validate-Julia.ps1
index e3c8973cc..fa4a26e14 100644
--- a/images/win/scripts/Installers/Validate-Julia.ps1
+++ b/images/win/scripts/Installers/Validate-Julia.ps1
@@ -14,36 +14,12 @@ else
     exit 1
 }
 
-# Add details of available versions in Markdown
-$tmplMark = @"
-#### {0}
-
-_Environment:_
-* {1}: root directory of the Julia {0} installation
-
-"@
-
-$tmplMarkRoot = @"
-#### {0}
-
-_Environment:_
-* PATH: contains the location of julia.exe version {0}
-* {1}: root directory of the Julia {0} installation
-"@
-
+# Add description of the software to Markdown
 $SoftwareName = "Julia (x64)"
-$Description = New-Object System.Text.StringBuilder
-$juliaVersionsToInstall = $env:JULIA_VERSIONS.split(",")
+$juliaVersion = $(julia --version) -match "\d+\.\d+\.\d+"
 
-foreach($julia in $juliaVersionsToInstall) {
-    $juliaVersion = Get-JuliaVersion
-    if ($juliaVersion -eq $julia) {
-        if($julia -eq $env:JULIA_DEFAULT) {
-            $null = $Description.AppendLine(($tmplMarkRoot -f $juliaVersion))
-        } else {
-            $null = $Description.AppendLine(($tmplMark -f $juliaVersion))
-        }
-    }
-}
+$Description = @"
+_Version:_ $juliaVersion<br/>
+"@
 
-Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description.ToString()
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

From be9cfd7f930da345abf37e420c7ffe92fc31cdac Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Tue, 11 Feb 2020 14:01:38 +0100
Subject: [PATCH 05/24] Fetch latest Julia version from GitHub API

---
 images/linux/scripts/installers/julia.sh | 36 ++++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh
index 849ff8f29..eabcc63f0 100644
--- a/images/linux/scripts/installers/julia.sh
+++ b/images/linux/scripts/installers/julia.sh
@@ -7,21 +7,33 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
+# This function fetches the latest Julia release from the GitHub API
+# Based on https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c
+function GetLatestJuliaRelease () {
+    curl --silent "https://api.github.com/repos/julialang/julia/releases/latest" |
+    grep '"tag_name":' |
+    sed -E 's/.*"([^"]+)".*/\1/' |
+    sed 's/v//' # remove v prefix
+}
+
+
 # This function installs Julia using the specified arguments:
-#   $1=MajorVersion (1.3)
-#   $2=MajorAndMinorVersion (1.3.1)
-#   $3=IsDefaultVersion (true or false)
+#   $1=MajorAndMinorVersion (1.3.1)
+#   $2=IsDefaultVersion (true or false)
 
 function InstallJulia () {
-    curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$1/julia-$2-linux-x86_64.tar.gz" -o "julia-$2-linux-x86_64.tar.gz"
-    mkdir -p "/usr/local/julia$1"
-    tar -C "/usr/local/julia$1" -xzf "julia-$2-linux-x86_64.tar.gz" --strip-components=1 julia
-    rm "julia-$2-linux-x86_64.tar.gz"
+    # Extract Major and Minor version from full version string
+    juliaMajorAndMinorVersion="$(sed 's/\.*[0-9]//3' <<< $1)"
+
+    curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$juliaMajorAndMinorVersion/julia-$1-linux-x86_64.tar.gz" -o "julia-$1-linux-x86_64.tar.gz"
+    mkdir -p "/usr/local/julia$juliaMajorAndMinorVersion"
+    tar -C "/usr/local/julia$juliaMajorAndMinorVersion" -xzf "julia-$1-linux-x86_64.tar.gz" --strip-components=1 julia
+    rm "julia-$1-linux-x86_64.tar.gz"
 
     # If this version of Julia is to be the default version,
     # symlink it into the path
-    if [ "$3" = true ]; then
-        ln -s "/usr/local/julia$1/bin/julia" /usr/bin/julia
+    if [ "$2" = true ]; then
+        ln -s "/usr/local/julia$juliaMajorAndMinorVersion/bin/julia" /usr/bin/julia
     fi
 
     # Run tests to determine that the software installed as expected
@@ -29,7 +41,7 @@ function InstallJulia () {
 
     # If this version of Julia is to be the default version,
     # check that it has been added to PATH
-    if [ "$3" = true ]; then
+    if [ "$2" = true ]; then
         if ! command -v julia; then
             echo "Julia was not installed or found on PATH"
             exit 1
@@ -37,7 +49,7 @@ function InstallJulia () {
     fi
 
     # Verify output of julia --version
-    if [ ! "$(/usr/local/julia"$1"/bin/julia --version)" = "julia version $2" ]; then
+    if [ ! "$(/usr/local/julia"$juliaMajorAndMinorVersion"/bin/julia --version)" = "julia version $1" ]; then
         echo "Julia was not installed correctly"
         exit 1
     fi
@@ -47,4 +59,4 @@ function InstallJulia () {
     DocumentInstalledItem "Julia ($(julia --version))"
 }
 
-InstallJulia 1.3 1.3.1 true
+InstallJulia "$(GetLatestJuliaRelease)" true

From e11f4638dc7f0b1a3d3f8267379240085f06567d Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Tue, 11 Feb 2020 14:38:33 +0100
Subject: [PATCH 06/24] Fix Major.Minor version regex

---
 images/linux/scripts/installers/julia.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh
index eabcc63f0..1ca450320 100644
--- a/images/linux/scripts/installers/julia.sh
+++ b/images/linux/scripts/installers/julia.sh
@@ -23,7 +23,7 @@ function GetLatestJuliaRelease () {
 
 function InstallJulia () {
     # Extract Major and Minor version from full version string
-    juliaMajorAndMinorVersion="$(sed 's/\.*[0-9]//3' <<< $1)"
+    juliaMajorAndMinorVersion="$(sed 's/\.[^.]*$//' <<< $1)"
 
     curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$juliaMajorAndMinorVersion/julia-$1-linux-x86_64.tar.gz" -o "julia-$1-linux-x86_64.tar.gz"
     mkdir -p "/usr/local/julia$juliaMajorAndMinorVersion"

From 68fb8ac37ca6a4778ce938bf5d87fd1fbe7b084e Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Wed, 12 Feb 2020 15:03:26 +0100
Subject: [PATCH 07/24] Fix Julia markdown description

---
 images/win/scripts/Installers/Validate-Julia.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Validate-Julia.ps1 b/images/win/scripts/Installers/Validate-Julia.ps1
index fa4a26e14..e31bd39f6 100644
--- a/images/win/scripts/Installers/Validate-Julia.ps1
+++ b/images/win/scripts/Installers/Validate-Julia.ps1
@@ -16,7 +16,7 @@ else
 
 # Add description of the software to Markdown
 $SoftwareName = "Julia (x64)"
-$juliaVersion = $(julia --version) -match "\d+\.\d+\.\d+"
+$juliaVersion = $(julia --version).split() -match "\d+\.\d+\.\d+"
 
 $Description = @"
 _Version:_ $juliaVersion<br/>

From 036ff7c43c3c2e54050d040d3577b479a899b5bc Mon Sep 17 00:00:00 2001
From: Sascha Mann <git@mail.saschamann.eu>
Date: Wed, 12 Feb 2020 15:17:05 +0100
Subject: [PATCH 08/24] Change Julia install directory

---
 images/win/scripts/Installers/Install-Julia.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Install-Julia.ps1 b/images/win/scripts/Installers/Install-Julia.ps1
index 0090d5304..90547472b 100644
--- a/images/win/scripts/Installers/Install-Julia.ps1
+++ b/images/win/scripts/Installers/Install-Julia.ps1
@@ -3,4 +3,4 @@
 ##  Desc:  Install Julia
 ################################################################################
 
-choco install julia -y
+choco install julia -y --ia "/D=C:\Julia"

From b42d8129daa7d8b5df9d0b0cf1cda0935b1cb6d4 Mon Sep 17 00:00:00 2001
From: BSKY <git@bsky.moe>
Date: Mon, 17 Feb 2020 09:01:43 +0900
Subject: [PATCH 09/24] Add zstd

---
 images/linux/scripts/installers/1604/basic.sh |  6 +++--
 images/linux/scripts/installers/1804/basic.sh | 10 +++++---
 images/win/Windows2016-Azure.json             | 12 ++++++++++
 .../win/scripts/Installers/Install-Zstd.ps1   |  6 +++++
 .../win/scripts/Installers/Validate-Zstd.ps1  | 24 +++++++++++++++++++
 5 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 images/win/scripts/Installers/Install-Zstd.ps1
 create mode 100644 images/win/scripts/Installers/Validate-Zstd.ps1

diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh
index fffeba833..99c80a313 100644
--- a/images/linux/scripts/installers/1604/basic.sh
+++ b/images/linux/scripts/installers/1604/basic.sh
@@ -31,11 +31,12 @@ apt-fast install -y --no-install-recommends \
     sudo \
     telnet \
     time \
+    tzdata \
     unzip \
     upx \
     wget \
     zip \
-    tzdata
+    zstd
 
 # Electron / VSCode / GitHub Desktop prereqs
 apt-fast install -y --no-install-recommends \
@@ -86,8 +87,9 @@ DocumentInstalledItemIndent "shellcheck"
 DocumentInstalledItemIndent "sudo"
 DocumentInstalledItemIndent "telnet"
 DocumentInstalledItemIndent "time"
+DocumentInstalledItemIndent "tzdata"
 DocumentInstalledItemIndent "unzip"
 DocumentInstalledItemIndent "upx"
 DocumentInstalledItemIndent "wget"
 DocumentInstalledItemIndent "zip"
-DocumentInstalledItemIndent "tzdata"
+DocumentInstalledItemIndent "zstd"
diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh
index 043400f8b..c12c7a819 100644
--- a/images/linux/scripts/installers/1804/basic.sh
+++ b/images/linux/scripts/installers/1804/basic.sh
@@ -58,6 +58,9 @@ apt-get install -y --no-install-recommends telnet
 echo "Install time"
 apt-get install -y --no-install-recommends time
 
+echo "Install tzdata"
+apt-get install -y --no-install-recommends tzdata
+
 echo "Install unzip"
 apt-get install -y --no-install-recommends unzip
 
@@ -70,8 +73,8 @@ apt-get install -y --no-install-recommends wget
 echo "Install zip"
 apt-get install -y --no-install-recommends zip
 
-echo "Install tzdata"
-apt-get install -y --no-install-recommends tzdata
+echo "Install zstd"
+apt-get install -y --no-install-recommends zstd
 
 echo "Install libxkbfile"
 apt-get install -y --no-install-recommends libxkbfile-dev
@@ -155,8 +158,9 @@ DocumentInstalledItemIndent "shellcheck"
 DocumentInstalledItemIndent "sudo"
 DocumentInstalledItemIndent "telnet"
 DocumentInstalledItemIndent "time"
+DocumentInstalledItemIndent "tzdata"
 DocumentInstalledItemIndent "unzip"
 DocumentInstalledItemIndent "upx"
 DocumentInstalledItemIndent "wget"
 DocumentInstalledItemIndent "zip"
-DocumentInstalledItemIndent "tzdata"
+DocumentInstalledItemIndent "zstd"
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 98d96feb9..5cba4e2c5 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -502,6 +502,12 @@
                 "{{ template_dir }}/scripts/Installers/Install-Jq.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -763,6 +769,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-Jq.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-Zstd.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1
new file mode 100644
index 000000000..098334ebe
--- /dev/null
+++ b/images/win/scripts/Installers/Install-Zstd.ps1
@@ -0,0 +1,6 @@
+################################################################################
+##  File:  Install-zstd.ps1
+##  Desc:  Install zstd
+################################################################################
+
+choco install zstandard -y
diff --git a/images/win/scripts/Installers/Validate-Zstd.ps1 b/images/win/scripts/Installers/Validate-Zstd.ps1
new file mode 100644
index 000000000..18f3a3343
--- /dev/null
+++ b/images/win/scripts/Installers/Validate-Zstd.ps1
@@ -0,0 +1,24 @@
+################################################################################
+##  File:  Validate-zstd.ps1
+##  Desc:  Validate zstd
+################################################################################
+
+if (Get-Command -Name 'zstd')
+{
+    Write-Host "zstd on path"
+}
+else
+{
+    Write-Host 'zstd is not on path'
+    exit 1
+}
+
+# Adding description of the software to Markdown
+$SoftwareName = "zstd"
+$zstdVersion = $(zstd --version).Split(' ')[6].Split(',')[0]
+
+$Description = @"
+_Version:_ $zstdVersion<br/>
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

From cb18129a4f31957af79b4d3e592cbfdc0e96e6c2 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Thu, 20 Feb 2020 13:46:38 +0300
Subject: [PATCH 10/24] remove pwsh fix

---
 images/linux/scripts/installers/1804/powershellcore.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh
index 0a5f21081..8ace4742c 100644
--- a/images/linux/scripts/installers/1804/powershellcore.sh
+++ b/images/linux/scripts/installers/1804/powershellcore.sh
@@ -12,9 +12,6 @@ LSB_RELEASE=$(lsb_release -rs)
 # Install Powershell
 apt-get install -y powershell
 
-# Temp fix based on: https://github.com/PowerShell/PowerShell/issues/9746 
-sudo apt remove libicu64
-
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
 if ! command -v pwsh; then

From 0db9ff9ce01652e7c8ae42eb16548b6a25f72c84 Mon Sep 17 00:00:00 2001
From: Christina Weems <chweems@microsoft.com>
Date: Thu, 20 Feb 2020 14:28:35 -0500
Subject: [PATCH 11/24] Install node-sass module

---
 images/win/scripts/Installers/Install-NodeLts.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1
index e98e7f393..e1ec5f0fb 100644
--- a/images/win/scripts/Installers/Install-NodeLts.ps1
+++ b/images/win/scripts/Installers/Install-NodeLts.ps1
@@ -32,3 +32,4 @@ npm install -g parcel-bundler
 npm install -g --save-dev webpack webpack-cli
 npm install -g yarn
 npm install -g lerna
+npm install -g node-sass

From 270945d64bde5a1777562adf8846c29d8bc11f0e Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Fri, 21 Feb 2020 13:40:21 +0300
Subject: [PATCH 12/24] add libicu65 installation

---
 images/linux/scripts/installers/1804/powershellcore.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh
index 8ace4742c..accd923b6 100644
--- a/images/linux/scripts/installers/1804/powershellcore.sh
+++ b/images/linux/scripts/installers/1804/powershellcore.sh
@@ -8,6 +8,9 @@
 source $HELPER_SCRIPTS/document.sh
 
 LSB_RELEASE=$(lsb_release -rs)
+# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
+# Fix - install additional libicu65 where the issue is fixed
+sudo apt get install libicu65
 
 # Install Powershell
 apt-get install -y powershell

From 934c7ca435fa87d4f518ed0a67ebf1f69cae2b8f Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Fri, 21 Feb 2020 13:49:25 +0300
Subject: [PATCH 13/24] AZURE_EXTENSION_DIR

---
 images/linux/scripts/installers/azure-cli.sh        | 7 +------
 images/linux/scripts/installers/azure-devops-cli.sh | 5 +++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh
index 665a188a8..713d23151 100644
--- a/images/linux/scripts/installers/azure-cli.sh
+++ b/images/linux/scripts/installers/azure-cli.sh
@@ -7,13 +7,8 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
-LSB_CODENAME=$(lsb_release -cs)
-
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
-echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $LSB_CODENAME main" | tee /etc/apt/sources.list.d/azure-cli.list
-apt-key adv --keyserver packages.microsoft.com --recv-keys B02C46DF417A0893
-apt-get update
-apt-get install -y --no-install-recommends apt-transport-https azure-cli
+curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
diff --git a/images/linux/scripts/installers/azure-devops-cli.sh b/images/linux/scripts/installers/azure-devops-cli.sh
index 2529c53c2..e709243d6 100644
--- a/images/linux/scripts/installers/azure-devops-cli.sh
+++ b/images/linux/scripts/installers/azure-devops-cli.sh
@@ -7,6 +7,11 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
+# AZURE_EXTENSION_DIR shell variable defines where modules are installed
+# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview
+export AZURE_EXTENSION_DIR=/opt/az/azcliextensions
+echo "AZURE_EXTENSION_DIR=$AZURE_EXTENSION_DIR" | tee -a /etc/environment
+
 # install azure devops Cli extension
 az extension add -n azure-devops
 

From deca0ce1e1cd3f8619876f02aa20f7732f22c720 Mon Sep 17 00:00:00 2001
From: David Kennedy <daveken@microsoft.com>
Date: Fri, 21 Feb 2020 09:24:54 -0500
Subject: [PATCH 14/24] Update Install-DotnetSDK.ps1

---
 images/win/scripts/Installers/Install-DotnetSDK.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1
index f7c9a9e23..5d1545500 100644
--- a/images/win/scripts/Installers/Install-DotnetSDK.ps1
+++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1
@@ -77,7 +77,9 @@ function InstallAllValidSdks()
                 # Remove duplicate entries & preview/rc version from download list
                 # Sort the sdks on version
                 $sdks = @($release.'sdk');
-                $sdks += $release.'sdks' | Where-Object { !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') }
+
+                # Remove version 3.1.102 from install list, .NET gave a heads-up that this might cause issues and they are working on a fix.
+                $sdks += $release.'sdks' | Where-Object { !$_.'version'.Equals('3.1.102') -and !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') }
                 $sdks = $sdks | Sort-Object { [Version] $_.'version' }
 
                 ForEach ($sdk in $sdks)

From 15568d893acceec1b361be4dc1fd0fd6abb998fe Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Sat, 22 Feb 2020 14:55:33 +0300
Subject: [PATCH 15/24] add echo

---
 images/linux/scripts/installers/1804/powershellcore.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh
index accd923b6..61bbb18d0 100644
--- a/images/linux/scripts/installers/1804/powershellcore.sh
+++ b/images/linux/scripts/installers/1804/powershellcore.sh
@@ -10,6 +10,7 @@ source $HELPER_SCRIPTS/document.sh
 LSB_RELEASE=$(lsb_release -rs)
 # libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
 # Fix - install additional libicu65 where the issue is fixed
+echo "install libicu65"
 sudo apt get install libicu65
 
 # Install Powershell

From 72040db7ae68f3a5814be60e708a57246e1b22d7 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Sat, 22 Feb 2020 14:57:14 +0300
Subject: [PATCH 16/24] remove sudo

---
 images/linux/scripts/installers/1804/powershellcore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/1804/powershellcore.sh
index 61bbb18d0..72ccdfa90 100644
--- a/images/linux/scripts/installers/1804/powershellcore.sh
+++ b/images/linux/scripts/installers/1804/powershellcore.sh
@@ -11,7 +11,7 @@ LSB_RELEASE=$(lsb_release -rs)
 # libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
 # Fix - install additional libicu65 where the issue is fixed
 echo "install libicu65"
-sudo apt get install libicu65
+apt get install libicu65
 
 # Install Powershell
 apt-get install -y powershell

From eadcb76db553a544c9fa356eec5a82ef82a6d315 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Mon, 24 Feb 2020 12:49:39 +0300
Subject: [PATCH 17/24] add sqllocaldb to readme

---
 images/win/scripts/Installers/Validate-DACFx.ps1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/images/win/scripts/Installers/Validate-DACFx.ps1 b/images/win/scripts/Installers/Validate-DACFx.ps1
index fb815c10e..27b01f5c3 100644
--- a/images/win/scripts/Installers/Validate-DACFx.ps1
+++ b/images/win/scripts/Installers/Validate-DACFx.ps1
@@ -15,6 +15,15 @@ else
     throw "DACFx is not installed!"
 }
 
+if(Get-Command -Name 'SqlLocalDB')
+{
+    $localDbPath = (Get-Command -Name 'SqlLocalDB').Source
+}
+else
+{
+    throw "SqlLocalDB is not installed!"
+}
+
 function Get-DacFxVersion
 {
     $regKey = "HKLM:\SOFTWARE\Microsoft\Microsoft SQL Server\Data-Tier Application Framework\CurrentVersion"
@@ -28,6 +37,7 @@ $SoftwareName = "SQL Server Data Tier Application Framework (x64)"
 
 $Description = @"
 _Version:_ $(Get-DacFxVersion)<br/>
+* SqlLocalDB is available at $localDbPath
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

From d0362fd9576ed9bb7ad186131a55d031c214ae0e Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Mon, 24 Feb 2020 12:56:03 +0300
Subject: [PATCH 18/24] provide more detailed description

---
 images/win/scripts/Installers/Validate-DACFx.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Validate-DACFx.ps1 b/images/win/scripts/Installers/Validate-DACFx.ps1
index 27b01f5c3..c7def3ef4 100644
--- a/images/win/scripts/Installers/Validate-DACFx.ps1
+++ b/images/win/scripts/Installers/Validate-DACFx.ps1
@@ -37,7 +37,7 @@ $SoftwareName = "SQL Server Data Tier Application Framework (x64)"
 
 $Description = @"
 _Version:_ $(Get-DacFxVersion)<br/>
-* SqlLocalDB is available at $localDbPath
+* SQL Server Express LocalDB is available at $localDbPath
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description

From e68b9e8b5d47f0a3fe1d4edaf77dc5c656787875 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Mon, 24 Feb 2020 19:11:13 +0300
Subject: [PATCH 19/24] add condition

---
 images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 9 ++++++---
 images/linux/scripts/installers/1804/dotnetcore-sdk.sh | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
index 7db727558..0193708e6 100644
--- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
@@ -53,9 +53,12 @@ done
 sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-    echo "$url" >> urls
-    echo "Adding $url to list to download later"
+    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+    if [ $sdk != "3.1.102" ]; then
+        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+        echo "$url" >> urls
+        echo "Adding $url to list to download later"
+    fi
 done
 
 # Download additional SDKs
diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
index d1fb73ec3..27a922ee8 100644
--- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
@@ -61,9 +61,12 @@ done
 sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-    echo "$url" >> urls
-    echo "Adding $url to list to download later"
+    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+    if [ $sdk != "3.1.102" ]; then
+        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+        echo "$url" >> urls
+        echo "Adding $url to list to download later"
+    fi
 done
 
 # Download additional SDKs

From 07f4ebc3bd93810f120d053e2aac8cc008d88af0 Mon Sep 17 00:00:00 2001
From: Joe Bourne <thejoebourneidentity@github.com>
Date: Mon, 24 Feb 2020 14:10:47 -0500
Subject: [PATCH 20/24] Updates to readme and note about mac (#457)

---
 README.md | 59 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index cf8a7eb08..79c92534b 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,46 @@
 # GitHub Actions Virtual Environments
-This repository contains the code that we use to create the GitHub Actions [virtual environments](https://help.github.com/en/articles/software-in-virtual-environments-for-github-actions).
-Please use the issue templates to submit requests and bug reports related to the installed software.
+This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners. To file bug reports, or request that tools be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose). To build a VM machine from this repo's source, see the [instructions](./help/CreateImageAndAzureResources.md).
 
-If you need help with how to set up your workflow file or use a specific tool,
-check out the [GitHub Actions Community Forum](https://github.community/t5/GitHub-Actions/bd-p/actions).
+For general questions about using the virtual environments or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/t5/GitHub-Actions/bd-p/actions).
 
-If you need help with how to build VM machine from source code, check out the [documentation](./help/CreateImageAndAzureResources.md).
+## Available Environments
+| Environment | YAML Label | Included Software | Latest Release & Rollout Progress |
+| --------------------|---------------------|--------------------|---------------------|
+| Ubuntu 18.04 | `ubuntu-latest` or `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1)
+| Ubuntu 16.04 | `ubuntu-16.04` | [ubuntu-16.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&redirect=1) |
+| macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | *Coming soon* |
+| Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1)
+| Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1)
 
-## OS's offered
-We currently offer Linux, macOS, and Windows virtual environments:
+***Looking for other Linux distributions?*** We do not plan to offer other Linux distributions. We recommend using Docker if you'd like to build using other distributions with the hosted virtual environments. Alternatively, you can leverage [self-hosted runners] and fully customize your environment to your needs.
 
-[![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1)
-[![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&redirect=1)
-[![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1)
-[![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1)
+***Where is the macOS source?*** We are in the process of preparing our macOS source to live in this repo so we can take contributions from the community. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues.
 
-- **Linux**. We offer Ubuntu 16.04 and Ubuntu 18.04. We do not plan to offer other Linux distributions. If you want to build using other distributions with the hosted virtual environments, we suggest you use Docker. Alternatively, you can host your own VMs and make use of self-hosted runners.
-- **macOS**. We offer macOS Catalina 10.15.
-- **Windows**. We offer Windows Server 2016 and Windows Server 2019.
+## Software Guidelines
+In general, these are the guidelines we consider when deciding what to pre-install:
 
-## Guidelines for what's installed
-We follow these rough guidelines when deciding what to pre-install:
-
-- Tools and ecosystems that are more popular and widely-used will be given priority.
-- More recent versions of tools will be given priority over older versions.
+- Tools and ecosystems that are broadly popular and widely-used will be given priority.
+- Recent versions of tools will be given priority over older versions.
 - Tools and versions that are deprecated or have reached end-of-life will not be added.
-- Tools and versions will be removed 6 months after they are deprecated or have reached end-of-life.
+- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life.
 - If a tool can be installed during the build, we will evaluate how much time is saved
-and how much space is used by having the tool pre-installed.
+ and how much space is used by having the tool pre-installed.
 
-## Updates to the virtual environments
-_Cadence_
+## Updates to virtual environments
+*Cadence*
 
-You can expect approximately weekly updates to the software on the virtual environments.
+We typically deploy weekly updates to the software on the virtual environments.
 For some tools, we always install the latest at the time of the deployment; for others,
 we pin the tool to specific version(s).
 
-_Notifications_
+*Following Along / Change Notifications*
 
-Right now, we don't have a great way for you to know when updates to the images are coming.
-When we have the code available here, you can watch the Releases for when we generate
-candidate environments, and when we deploy new ones.
+* **High Impact Changes** (ex. breaking changes, new or deprecated environments) will be posted to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog).
+* **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases) to see when we generate candidate environments or deploy new ones. You can also track upcoming changes on the [virtual environment project](https://github.com/actions/virtual-environments/projects/1) to see which issues are under development.
+
+[ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/master/images/linux/Ubuntu1804-README.md
+[ubuntu-16.04]: https://github.com/actions/virtual-environments/blob/master/images/linux/Ubuntu1604-README.md
+[Windows-2019]: https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
+[windows-2016]: https://github.com/actions/virtual-environments/blob/master/images/win/Windows2016-Readme.md
+[macOS-10.15]: https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
+[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners
\ No newline at end of file

From b05ca822c29ebb20412aa0ba72fa669852fc40e6 Mon Sep 17 00:00:00 2001
From: Image generation service account <no-reply@microsoft.com>
Date: Mon, 24 Feb 2020 19:55:47 +0000
Subject: [PATCH 21/24] Updating readme file for AzP.20200217.win16.1 version
 20200217

---
 images/win/Windows2016-Readme.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index 7bf8c199b..688cd1de7 100644
--- a/images/win/Windows2016-Readme.md
+++ b/images/win/Windows2016-Readme.md
@@ -1,6 +1,6 @@
 # Windows Server 2016
 
-The following software is installed on machines with the 20200211.1 update.
+The following software is installed on machines with the 20200217.1 update.
 
 Components marked with **\*** have been upgraded since the previous version of the image.
 
@@ -19,7 +19,7 @@ _Environment:_
 
 ## Docker-compose
 
-_Version:_ 1.25.3<br/>
+_Version:_ 1.25.4<br/>
 _Environment:_
 * PATH: contains location of docker-compose.exe
 
@@ -30,9 +30,9 @@ _Version:_ 6.2.4
<br/>
 ## Docker images
 
 The following container images have been cached:
-* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:10ea07b6576daae149fe5ec7d0dddc8da673f77d171e2143addeae0b5577a12e)
 * mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 (Digest: sha256:a1bd1a6dc00f2734b5071b9295f715f36a653e4b2d259c1a4a4d9e8cd6f3ade8)
 * mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 (Digest: sha256:7e81f462be36ba1362062306426c65547e6d63b2eab0b5583808581081393a79)
+* mcr.microsoft.com/windows/servercore:ltsc2016 (Digest: sha256:42be24b8810c861cc1b3fe75c5e99f75061cb45fdbae1de46d151c18cc8e6a9a)
 * microsoft/aspnetcore-build:1.0-2.0 (Digest: sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c)
 * mcr.microsoft.com/windows/nanoserver:10.0.14393.953 (Digest: sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268)
 
@@ -482,12 +482,12 @@ _Environment:_
 ## Google Chrome
 
 _version:_
-80.0.3987.100
+80.0.3987.106
 
 ## Microsoft Edge
 
 _version:_
-80.0.361.50
+80.0.361.54
 
 ## Mozilla Firefox
 
@@ -516,7 +516,7 @@ _Environment:_
 #### IE Driver
 
 _version:_
-80.0.3987.16
+80.0.3987.106
 
 _Environment:_
 * IEWebDriver: location of IEDriverServer.exe
@@ -532,7 +532,7 @@ _Environment:_
 
 ## Node.js
 
-_Version:_ 12.15.0<br/>
+_Version:_ 12.16.0<br/>
 _Architecture:_ x64<br/>
 _Environment:_
 * PATH: contains location of node.exe<br/>

From 454198d92c03bbec95bf354cb2ded54ff25e9abb Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 25 Feb 2020 13:50:31 +0300
Subject: [PATCH 22/24] add one more workaround

---
 images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 7 ++++++-
 images/linux/scripts/installers/1804/dotnetcore-sdk.sh | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
index 0193708e6..46f881c59 100644
--- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
@@ -34,7 +34,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
     echo "Determing if .NET Core ($latest_package) is installed"
     if ! IsInstalled $latest_package; then
         echo "Could not find .NET Core ($latest_package), installing..."
-        apt-get install $latest_package -y
+        #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+        if [ $latest_package != "dotnet-sdk-3.1" ]; then
+            apt-get install $latest_package -y
+        else
+            apt-get install dotnet-sdk-3.1=3.1.101-1 -y
+        fi
     else
         echo ".NET Core ($latest_package) is already installed"
     fi
diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
index 27a922ee8..474ad501b 100644
--- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
@@ -42,7 +42,12 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do
         sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list'
         apt-get install apt-transport-https
         apt-get update
-        apt-get install $latest_package -y
+        #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+        if [ $latest_package != "dotnet-sdk-3.1" ]; then
+            apt-get install $latest_package -y
+        else
+            apt-get install dotnet-sdk-3.1=3.1.101-1 -y
+        fi
     else
         echo ".NET Core ($latest_package) is already installed"
     fi

From e9bcc3e9f595d033132b9fe4cfc12ffa5faab5e9 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 25 Feb 2020 14:37:54 +0300
Subject: [PATCH 23/24] remove 3.1.102 from sorted sdk list

---
 .../linux/scripts/installers/1604/dotnetcore-sdk.sh  | 12 +++++-------
 .../linux/scripts/installers/1804/dotnetcore-sdk.sh  | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
index 46f881c59..c0d48dfdd 100644
--- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh
@@ -55,15 +55,13 @@ for release_url in ${release_urls[@]}; do
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version'))
 done
 
-sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
+#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
-    if [ $sdk != "3.1.102" ]; then
-        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-        echo "$url" >> urls
-        echo "Adding $url to list to download later"
-    fi
+    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+    echo "$url" >> urls
+    echo "Adding $url to list to download later"
 done
 
 # Download additional SDKs
diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
index 474ad501b..b2081510d 100644
--- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh
@@ -63,15 +63,13 @@ for release_url in ${release_urls[@]}; do
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version'))
 done
 
-sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
+#temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
+sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v 3.1.102 | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r)
 
 for sdk in $sortedSdks; do
-    #temporary avoid 3.1.102 installation due to https://github.com/dotnet/aspnetcore/issues/19133
-    if [ $sdk != "3.1.102" ]; then
-        url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
-        echo "$url" >> urls
-        echo "Adding $url to list to download later"
-    fi
+    url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$sdk/dotnet-sdk-$sdk-linux-x64.tar.gz"
+    echo "$url" >> urls
+    echo "Adding $url to list to download later"
 done
 
 # Download additional SDKs

From 5ce1c140d195a2cb93737caab597078fbc0936dd Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 25 Feb 2020 17:09:24 +0300
Subject: [PATCH 24/24] add another condition to get current releases

---
 images/win/scripts/Installers/Install-DotnetSDK.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1
index 5d1545500..996887885 100644
--- a/images/win/scripts/Installers/Install-DotnetSDK.ps1
+++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1
@@ -66,7 +66,8 @@ function InstallAllValidSdks()
         Invoke-WebRequest -Uri $dotnetChannel.'releases.json' -UseBasicParsing -OutFile "releases-$channelVersion.json"
         $currentReleases = Get-Content -Path "releases-$channelVersion.json" | ConvertFrom-Json
         # filtering out the preview/rc releases
-        $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } | Sort-Object { [Version] $_.'release-version' }
+        # Remove version 3.1.102 from install list, .NET gave a heads-up that this might cause issues and they are working on a fix. https://github.com/dotnet/aspnetcore/issues/19133
+        $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') -and !$_.'release-version'.Contains('3.1.2') } | Sort-Object { [Version] $_.'release-version' }
         ForEach ($release in $currentReleases)
         {
             if ($release.'sdks'.Count -gt 0)
@@ -78,8 +79,7 @@ function InstallAllValidSdks()
                 # Sort the sdks on version
                 $sdks = @($release.'sdk');
 
-                # Remove version 3.1.102 from install list, .NET gave a heads-up that this might cause issues and they are working on a fix.
-                $sdks += $release.'sdks' | Where-Object { !$_.'version'.Equals('3.1.102') -and !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') }
+                $sdks += $release.'sdks' | Where-Object { !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') }
                 $sdks = $sdks | Sort-Object { [Version] $_.'version' }
 
                 ForEach ($sdk in $sdks)