From 0dfb1b07ddda289fb7cce7f9d9f8b7ff3b38a2a2 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Thu, 1 Oct 2020 17:53:12 +0300
Subject: [PATCH 01/44] Enable Java tests since Java switching was fixed in
 MacOS 11.0 beta 9

---
 images/macos/software-report/SoftwareReport.Generator.ps1 | 6 ++----
 images/macos/tests/Java.Tests.ps1                         | 2 +-
 images/macos/tests/Python.Tests.ps1                       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 87c94459..b403cd78 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -80,6 +80,7 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1
 $npmVersion = Run-Command "npm --version"
 $yarnVersion = Run-Command "yarn --version"
 $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2
+$pipVersion = Get-PipVersion -Version 2
 $pip3Version = Get-PipVersion -Version 3
 $condaVersion = Invoke-Expression "conda --version"
 $rubyGemsVersion = Run-Command "gem --version"
@@ -90,12 +91,9 @@ if ($os.IsHigherThanMojave) {
     $vcpkgVersion = Get-VcpkgVersion
     $markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine
 }
-if ($os.IsLessThanBigSur) {
-    $pipVersion = Get-PipVersion -Version 2
-    $markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine
-}
 
 $markdown += New-MDList -Style Unordered -Lines @(
+    "Pip ${pipVersion}",
     "Pip ${pip3Version}",
     $bundlerVersion,
     "Carthage ${carthageVersion}",
diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1
index 9171eb5b..450c23ec 100644
--- a/images/macos/tests/Java.Tests.ps1
+++ b/images/macos/tests/Java.Tests.ps1
@@ -11,7 +11,7 @@ function Get-NativeVersionFormat {
     return $Version
 }
 
-Describe "Java" -Skip:($os.IsBigSur) {
+Describe "Java" {
     BeforeAll {
         function Validate-JavaVersion {
             param($JavaCommand, $ExpectedVersion)
diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1
index 76cd8941..76e5b497 100644
--- a/images/macos/tests/Python.Tests.ps1
+++ b/images/macos/tests/Python.Tests.ps1
@@ -12,7 +12,7 @@ Describe "Python" {
         (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*"
     }
 
-    It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) {
+    It "Python 2 is installed under /usr/local/bin" {
         Get-WhichTool "python" | Should -BeLike "/usr/local/bin*"
     }
 
@@ -24,7 +24,7 @@ Describe "Python" {
         Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*"
     }
 
-    It "Pip 2 is available" -Skip:($os.IsBigSur) {
+    It "Pip 2 is available" {
         "pip --version" | Should -ReturnZeroExitCode
     }
 

From 592fcf2f6613d7c8f02e5acc0106a58f8fbc0886 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 27 Oct 2020 09:45:22 +0300
Subject: [PATCH 02/44] change wget and curl to retry functions

---
 images/macos/helpers/Common.Helpers.psm1      | 45 +++++++++++++++++++
 images/macos/provision/core/aws.sh            |  5 ++-
 images/macos/provision/core/azcopy.sh         |  4 +-
 images/macos/provision/core/node.sh           |  2 +-
 images/macos/provision/core/openjdk.sh        |  2 +-
 images/macos/provision/core/pypy.sh           |  3 +-
 images/macos/provision/core/stack.sh          |  4 +-
 images/macos/provision/core/toolset.ps1       |  2 +-
 images/macos/provision/utils/xamarin-utils.sh |  6 ++-
 9 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1
index dd8a2184..f77a8c2b 100644
--- a/images/macos/helpers/Common.Helpers.psm1
+++ b/images/macos/helpers/Common.Helpers.psm1
@@ -83,3 +83,48 @@ function Invoke-RestMethodWithRetry {
     )
     Invoke-RestMethod $Url -MaximumRetryCount 10 -RetryIntervalSec 30
 }
+
+function Start-DownloadWithRetry
+{
+    Param
+    (
+        [Parameter(Mandatory)]
+        [string] $Url,
+        [string] $Name,
+        [string] $DownloadPath = "${env:Temp}",
+        [int] $Retries = 20
+    )
+
+    if ([String]::IsNullOrEmpty($Name)) {
+        $Name = [IO.Path]::GetFileName($Url)
+    }
+
+    $filePath = Join-Path -Path $DownloadPath -ChildPath $Name
+
+    #Default retry logic for the package.
+    while ($Retries -gt 0)
+    {
+        try
+        {
+            Write-Host "Downloading package from: $Url to path $filePath ."
+            (New-Object System.Net.WebClient).DownloadFile($Url, $filePath)
+            break
+        }
+        catch
+        {
+            Write-Host "There is an error during package downloading:`n $_"
+            $Retries--
+
+            if ($Retries -eq 0)
+            {
+                Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url"
+                exit 1
+            }
+
+            Write-Host "Waiting 30 seconds before retrying. Retries left: $Retries"
+            Start-Sleep -Seconds 30
+        }
+    }
+
+    return $filePath
+}
\ No newline at end of file
diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index 02009449..f015f6fc 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -1,7 +1,10 @@
 #!/bin/bash -e -o pipefail
 
+source ~/utils/utils.sh
+
 echo Installing aws...
-curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"
+AWSCLIURL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
+download_with_retries $AWSCLIURL "."
 sudo installer -pkg AWSCLIV2.pkg -target /
 rm -rf AWSCLIV2.pkg
 
diff --git a/images/macos/provision/core/azcopy.sh b/images/macos/provision/core/azcopy.sh
index 5098c878..8325c803 100755
--- a/images/macos/provision/core/azcopy.sh
+++ b/images/macos/provision/core/azcopy.sh
@@ -1,8 +1,10 @@
 #!/bin/bash -e -o pipefail
 
+source ~/utils/utils.sh
+
 AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac"
 
-wget -O "$HOME/azcopy.zip" "$AZCOPY_DOWNLOAD_URL"
+download_with_retries $AZCOPY_DOWNLOAD_URL "." "azcopy.zip"
 unzip azcopy.zip -d azcopy
 AZCOPY_EXTRACTED=$(echo azcopy/azcopy*)
 cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy"
diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index 59e727ce..139bb8a4 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -11,7 +11,7 @@ if is_Less_Catalina; then
   echo Installing the latest Node JS 8...
   TMP_FILE=/tmp/node-v8.17.0.pkg
   NODEURL=https://nodejs.org/dist/latest-v8.x/node-v8.17.0.pkg
-  curl "${NODEURL}" -o "${TMP_FILE}"
+  download_with_retries $NODEURL "/tmp"
   sudo installer -pkg "${TMP_FILE}" -target /
   rm -rf "${TMP_FILE}"
   sudo chown -R $USER "/usr/local/lib/node_modules"
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
index c2b22baf..8fb36b81 100644
--- a/images/macos/provision/core/openjdk.sh
+++ b/images/macos/provision/core/openjdk.sh
@@ -7,7 +7,7 @@ installAzulJDK() {
     local TMP_FILE=/tmp/openjdk.dmg
     local TMP_MOUNT=`/usr/bin/mktemp -d /tmp/zulu.XXXX`
     # Download dmg
-    curl "${URL}" -o "${TMP_FILE}"
+    download_with_retries $URL "/tmp" "openjdk.dmg"
     # Attach dmg
     hdiutil attach "${TMP_FILE}" -mountpoint "${TMP_MOUNT}"
     # Install pkg
diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh
index d55d785a..8a373f4c 100644
--- a/images/macos/provision/core/pypy.sh
+++ b/images/macos/provision/core/pypy.sh
@@ -3,6 +3,7 @@
 ##  File:  pypy.sh
 ##  Desc:  Installs PyPy
 ################################################################################
+
 source ~/utils/utils.sh
 
 function InstallPyPy
@@ -12,7 +13,7 @@ function InstallPyPy
     PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}')
     echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'"
     PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME"
-    wget -q -O $PACKAGE_TAR_TEMP_PATH $PACKAGE_URL
+    download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "PACKAGE_TAR_NAME"
 
     echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder"
     tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp
diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh
index 17c5ecd9..a642d985 100644
--- a/images/macos/provision/core/stack.sh
+++ b/images/macos/provision/core/stack.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e -o pipefail
 
+source ~/utils/utils.sh
+
 echo "Get the latest Stack version..."
 StackRelease=$(curl -s "https://api.github.com/repos/commercialhaskell/stack/releases/latest")
 DownloadUrl=$(echo $StackRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x86_64.tar.gz"))' | head -n 1)
@@ -7,7 +9,7 @@ StackVersion=$(echo $StackRelease | jq -r '.name' | cut -c2-)
 StackArchive="/tmp/stack.tar.gz"
 
 echo "Download stack version $StackVersion..."
-wget $DownloadUrl -O $StackArchive
+download_with_retries $DownloadUrl "/tmp" "stack.tar.gz"
 
 StackToolcachePath="$AGENT_TOOLSDIRECTORY/stack/$StackVersion"
 DestinationPath="$StackToolcachePath/x64"
diff --git a/images/macos/provision/core/toolset.ps1 b/images/macos/provision/core/toolset.ps1
index 9238b9ff..8241f4ab 100644
--- a/images/macos/provision/core/toolset.ps1
+++ b/images/macos/provision/core/toolset.ps1
@@ -23,7 +23,7 @@ Function Install-Asset {
     $assetArchivePath = Join-Path $assetFolderPath $ReleaseAsset.filename
 
     Write-Host "Download $($ReleaseAsset.filename) archive to the $assetFolderPath folder..."
-    wget -P $assetFolderPath $ReleaseAsset.download_url --retry-connrefused --retry-on-http-error=429,500,503 --wait=30 --no-verbose
+    Start-DownloadWithRetry -Url $ReleaseAsset.download_url -DownloadPath $assetFolderPath
 
     Write-Host "Extract $($ReleaseAsset.filename) content..."
     tar -xzf $assetArchivePath -C $assetFolderPath
diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh
index 1017cec2..11b1f53a 100644
--- a/images/macos/provision/utils/xamarin-utils.sh
+++ b/images/macos/provision/utils/xamarin-utils.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e -o pipefail
 
+source ~/utils/utils.sh
+
 # Xamarin can clean their SDKs while updating to newer versions,
 # so we should be able to detect it during image generation
 downloadAndInstallPKG() {
@@ -175,7 +177,7 @@ downloadNUnitConsole() {
     pushd $TMPMOUNT
 
     sudo mkdir -p $NUNIT3_PATH
-    sudo curl -L -o nunit3.zip $NUNIT3_LOCATION
+    sudo download_with_retries $NUNIT3_LOCATION "." "nunit3.zip"
 
     echo "Installing NUnit 3..."
     sudo unzip nunit3.zip -d $NUNIT3_PATH
@@ -191,7 +193,7 @@ installNuget() {
   echo "Installing nuget $NUGET_VERSION for Mono $MONO_VERSION"
   cd ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
   sudo mv nuget.exe nuget_old.exe
-  sudo curl -L -o nuget.exe $NUGET_URL
+  sudo download_with_retries $NUGET_URL "." "nuget.exe"
   sudo chmod a+x nuget.exe
 }
 

From 2eff72c7e1ab15b24cfe7d42a2fb485477b22d66 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Tue, 27 Oct 2020 18:41:51 +0300
Subject: [PATCH 03/44] remove sudo

---
 images/macos/provision/utils/xamarin-utils.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh
index 11b1f53a..9e549a9c 100644
--- a/images/macos/provision/utils/xamarin-utils.sh
+++ b/images/macos/provision/utils/xamarin-utils.sh
@@ -177,7 +177,7 @@ downloadNUnitConsole() {
     pushd $TMPMOUNT
 
     sudo mkdir -p $NUNIT3_PATH
-    sudo download_with_retries $NUNIT3_LOCATION "." "nunit3.zip"
+    download_with_retries $NUNIT3_LOCATION "." "nunit3.zip"
 
     echo "Installing NUnit 3..."
     sudo unzip nunit3.zip -d $NUNIT3_PATH
@@ -193,7 +193,7 @@ installNuget() {
   echo "Installing nuget $NUGET_VERSION for Mono $MONO_VERSION"
   cd ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
   sudo mv nuget.exe nuget_old.exe
-  sudo download_with_retries $NUGET_URL "." "nuget.exe"
+  download_with_retries $NUGET_URL "." "nuget.exe"
   sudo chmod a+x nuget.exe
 }
 

From 5ec18c4b3d47230b0bca0da4b615f348a171e55a Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Mon, 2 Nov 2020 15:47:58 +0300
Subject: [PATCH 04/44] Update Java.Tests.ps1

---
 images/macos/tests/Java.Tests.ps1 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1
index 450c23ec..9e21a5e4 100644
--- a/images/macos/tests/Java.Tests.ps1
+++ b/images/macos/tests/Java.Tests.ps1
@@ -38,17 +38,15 @@ Describe "Java" {
             }
 
             It "Version is valid" -TestCases $_ {
-                $javaRootPath = (Get-CommandResult "/usr/libexec/java_home -v${Version}").Output
+                $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk//Contents/Home"
                 $javaBinPath = Join-Path $javaRootPath "/bin/java"
                 Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
             }
 
             It "<EnvVariable>" -TestCases $_ {
                 $envVariablePath = Get-EnvironmentVariable $EnvVariable
-                $commandResult = Get-CommandResult "/usr/libexec/java_home -v${Version}"
-                $commandResult.ExitCode | Should -Be 0
-                $commandResult.Output | Should -Not -BeNullOrEmpty
-                $commandResult.Output | Should -Be $envVariablePath
+                $javaBinPath = Join-Path $envVariablePath "/bin/java"
+                Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
             }
 
             if ($_.Title -eq "Default") {

From 2faf574423319fe498d4ef69435c987585958db6 Mon Sep 17 00:00:00 2001
From: Arthur Baars <aibaars@github.com>
Date: Mon, 2 Nov 2020 16:17:58 +0100
Subject: [PATCH 05/44] OSX: Rust tools: install 'rustfmt' and 'clippy'

Make installed Rust components the same as for Ubuntu. See also:
https://github.com/actions/virtual-environments/blob/f38833acec5cc1c3239474f8135b23c17cb72351/images/linux/scripts/installers/rust.sh
---
 images/macos/provision/core/rust.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/images/macos/provision/core/rust.sh b/images/macos/provision/core/rust.sh
index de82c7b4..89e70537 100644
--- a/images/macos/provision/core/rust.sh
+++ b/images/macos/provision/core/rust.sh
@@ -11,7 +11,8 @@ CARGO_HOME=$HOME/.cargo
 source $CARGO_HOME/env
 
 echo Install common tools...
+rustup component add rustfmt clippy
 cargo install bindgen cbindgen cargo-audit cargo-outdated
 
 echo Cleanup Cargo registry cached data...
-rm -rf $CARGO_HOME/registry/*
\ No newline at end of file
+rm -rf $CARGO_HOME/registry/*

From 338cbea4e2b7d95c0d6e4c2a9f550559fc10ca5c Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Tue, 3 Nov 2020 14:14:24 +0300
Subject: [PATCH 06/44] Fix Xamarin Nuget installation

---
 images/macos/provision/utils/xamarin-utils.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh
index 9e549a9c..c6b66a1e 100644
--- a/images/macos/provision/utils/xamarin-utils.sh
+++ b/images/macos/provision/utils/xamarin-utils.sh
@@ -193,8 +193,11 @@ installNuget() {
   echo "Installing nuget $NUGET_VERSION for Mono $MONO_VERSION"
   cd ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
   sudo mv nuget.exe nuget_old.exe
+
+  pushd $TMPMOUNT
   download_with_retries $NUGET_URL "." "nuget.exe"
   sudo chmod a+x nuget.exe
+  popd
 }
 
 createUWPShim() {

From 9fe3134cd6346cd8aba2d4f73c181f13c9af4585 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Tue, 3 Nov 2020 15:55:19 +0300
Subject: [PATCH 07/44] remove quotes on post-deployment step

---
 images/linux/scripts/installers/post-deployment.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index d427a172..9b3e2fe0 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -17,13 +17,11 @@ rm -rf $HELPER_SCRIPT_FOLDER
 rm -rf $INSTALLER_SCRIPT_FOLDER
 chmod 755 $IMAGE_FOLDER
 
-# Check PATH
-if [[ $PATH == \"*\" ]]
-then
-    echo "ERROR: PATH contains quotes"
-    echo "PATH = $PATH"
-    exit 1
-fi
+# Remove quotes from PATH
+PATH=${PATH#"\""}
+PATH=${PATH%"\""}
+echo "PATH=$PATH" | sudo tee -a /etc/environment
+echo "Updated PATH: $PATH
 
 # Clean yarn and npm cache
 yarn cache clean

From 09533dd5e91bce212f0b176aaa9857edfbaf1285 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Tue, 3 Nov 2020 15:56:49 +0300
Subject: [PATCH 08/44] fixed comment

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

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 9b3e2fe0..36a914c6 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -17,7 +17,7 @@ rm -rf $HELPER_SCRIPT_FOLDER
 rm -rf $INSTALLER_SCRIPT_FOLDER
 chmod 755 $IMAGE_FOLDER
 
-# Remove quotes from PATH
+# Remove quotes around PATH
 PATH=${PATH#"\""}
 PATH=${PATH%"\""}
 echo "PATH=$PATH" | sudo tee -a /etc/environment

From 43e905b4bd90fa014a531a7cfce12b7d781cce4b Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Tue, 3 Nov 2020 16:58:07 +0300
Subject: [PATCH 09/44] Update Java.Tests.ps1

---
 images/macos/tests/Java.Tests.ps1 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1
index 9e21a5e4..3ece545f 100644
--- a/images/macos/tests/Java.Tests.ps1
+++ b/images/macos/tests/Java.Tests.ps1
@@ -1,8 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
 
-#Java tests are disabled because Java is not working properly on macOS 11.0 yet.
-$os = Get-OSVersion
 function Get-NativeVersionFormat {
     param($Version)
     if ($Version -in "7", "8") {
@@ -37,10 +35,13 @@ Describe "Java" {
                 "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode
             }
 
-            It "Version is valid" -TestCases $_ {
-                $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk//Contents/Home"
-                $javaBinPath = Join-Path $javaRootPath "/bin/java"
-                Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
+            if ($_.Title -ne "Default") {
+                It "Version is valid" -TestCases $_ {
+                    $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
+                    if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
+                    $javaBinPath = Join-Path $javaRootPath "/bin/java"
+                    Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
+                }
             }
 
             It "<EnvVariable>" -TestCases $_ {

From 9d8d110fcf7e00fb55c89ba3b48c393af73d5c2d Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Wed, 4 Nov 2020 00:42:36 +0300
Subject: [PATCH 10/44] typo

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

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 36a914c6..2c7e6514 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -21,7 +21,7 @@ chmod 755 $IMAGE_FOLDER
 PATH=${PATH#"\""}
 PATH=${PATH%"\""}
 echo "PATH=$PATH" | sudo tee -a /etc/environment
-echo "Updated PATH: $PATH
+echo "Updated PATH: $PATH"
 
 # Clean yarn and npm cache
 yarn cache clean

From aee4de77553ba46c02c81dbdab6c77faf6b1f4a9 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Wed, 4 Nov 2020 09:23:31 +0300
Subject: [PATCH 11/44] deprecate old tools on MacOS

---
 images/macos/provision/core/node.sh        | 4 ++--
 images/macos/provision/core/xcode-tools.sh | 1 +
 images/macos/toolsets/toolset-10.15.json   | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index 59e727ce..194437a9 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -27,8 +27,8 @@ if is_Less_Catalina; then
   npm install -g appcenter-cli@^1.0.0
 else
   # Install Node.JS 12 for macOS >= 10.15
-  brew install node@12
-  brew link node@12 --force
+  brew install node@14
+  brew link node@14 --force
 
   for module in ${node_modules[@]}; do
     echo "Install $module"
diff --git a/images/macos/provision/core/xcode-tools.sh b/images/macos/provision/core/xcode-tools.sh
index 773b07a9..5c491708 100755
--- a/images/macos/provision/core/xcode-tools.sh
+++ b/images/macos/provision/core/xcode-tools.sh
@@ -77,6 +77,7 @@ runFirstLaunch $DEFAULT_XCODE_VERSION
 if is_Catalina; then
     ln -sf /Applications/Xcode_11.2.1.app /Applications/Xcode_11.2.app
     ln -sf /Applications/Xcode_11.3.1.app /Applications/Xcode_11.3.app
+    ln -sf /Applications/Xcode_11.4.1.app /Applications/Xcode_11.4.app
 fi
 
 echo "Setting Xcode ${DEFAULT_XCODE_VERSION} as default"
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 11a7e016..79f6d9eb 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
     "xcode": {
         "default": "12",
         "versions": [
-            "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
+            "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
         ]
     },
     "xamarin": {
@@ -168,8 +168,6 @@
             "arch": "x64",
             "platform" : "darwin",
             "versions": [
-                "1.11.*",
-                "1.12.*",
                 "1.13.*",
                 "1.14.*",
                 "1.15.*"

From 98731b3621b18f424be83be0e03eca9baf63b636 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Thu, 5 Nov 2020 10:36:01 +0300
Subject: [PATCH 12/44] get PATH from /etc/environment

---
 images/linux/scripts/installers/post-deployment.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 2c7e6514..403a1097 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -18,10 +18,11 @@ rm -rf $INSTALLER_SCRIPT_FOLDER
 chmod 755 $IMAGE_FOLDER
 
 # Remove quotes around PATH
-PATH=${PATH#"\""}
-PATH=${PATH%"\""}
-echo "PATH=$PATH" | sudo tee -a /etc/environment
-echo "Updated PATH: $PATH"
+ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//')
+ENVPATH=${ENVPATH#"\""}
+ENVPATH=${ENVPATH%"\""}
+echo "PATH=$ENVPATH" | sudo tee -a /etc/environment
+echo "Updated /etc/environment: $(cat /etc/environment)"
 
 # Clean yarn and npm cache
 yarn cache clean

From 5fac6462098bc23c2c45728ced9120e74f064676 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Thu, 5 Nov 2020 10:38:20 +0300
Subject: [PATCH 13/44] Update Node.Tests.ps1

---
 images/macos/tests/Node.Tests.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1
index 7fde021d..65005eb6 100644
--- a/images/macos/tests/Node.Tests.ps1
+++ b/images/macos/tests/Node.Tests.ps1
@@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
 Describe "Node.JS" {
     BeforeAll {
         $os = Get-OSVersion
-        $expectedNodeVersion = if ($os.IsHigherThanMojave) { "v12.*" } else { "v8.*" }
+        $expectedNodeVersion = if ($os.IsHigherThanMojave) { "v14.*" } else { "v8.*" }
     }
 
     It "Node.JS is installed" {
@@ -29,7 +29,7 @@ Describe "NVM" {
         $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh"
         $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true"
     }
-    
+
     It "Nvm is installed" {
         $nvmPath | Should -Exist
         "$nvmInitCommand && nvm --version" | Should -ReturnZeroExitCode
@@ -43,7 +43,7 @@ Describe "NVM" {
             param (
                 [string] $NvmVersion
             )
-            
+
             "$nvmInitCommand && nvm ls $($NvmVersion)" | Should -ReturnZeroExitCode
         }
     }

From 31b11e1576fe59335ba4845df91aa8515308b427 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Thu, 5 Nov 2020 15:38:26 +0300
Subject: [PATCH 14/44] select last entry of PATH, respect eol

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

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 403a1097..4202469d 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER
 chmod 755 $IMAGE_FOLDER
 
 # Remove quotes around PATH
-ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//')
+ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//')
 ENVPATH=${ENVPATH#"\""}
 ENVPATH=${ENVPATH%"\""}
 echo "PATH=$ENVPATH" | sudo tee -a /etc/environment

From ad583eba90bab0332a4cc322bbfedad21a901312 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Thu, 5 Nov 2020 15:53:49 +0300
Subject: [PATCH 15/44] add reboot for Ubuntu20

---
 images/linux/scripts/base/apt.sh   |  6 +-----
 images/linux/scripts/base/repos.sh |  5 ++++-
 images/linux/ubuntu1604.json       |  3 +++
 images/linux/ubuntu1804.json       |  3 +++
 images/linux/ubuntu2004.json       | 11 +++++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh
index 1efbb672..cf221452 100644
--- a/images/linux/scripts/base/apt.sh
+++ b/images/linux/scripts/base/apt.sh
@@ -1,9 +1,5 @@
 #!/bin/bash -e
 
-export DEBIAN_FRONTEND=noninteractive
-apt-get -yq update
-apt-get -yq dist-upgrade
-
 # Stop and disable apt-daily upgrade services;
 systemctl stop apt-daily.timer
 systemctl disable apt-daily.timer
@@ -16,7 +12,7 @@ systemctl disable apt-daily-upgrade.service
 sudo sed -i 's/APT::Periodic::Update-Package-Lists "1"/APT::Periodic::Update-Package-Lists "0"/' /etc/apt/apt.conf.d/20auto-upgrades
 
 # Enable retry logic for apt up to 10 times
-echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries 
+echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries
 
 # Configure apt to always assume Y
 echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes
diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh
index 9005d32a..a489c62a 100644
--- a/images/linux/scripts/base/repos.sh
+++ b/images/linux/scripts/base/repos.sh
@@ -16,4 +16,7 @@ curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
 mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
-apt-get update
\ No newline at end of file
+
+# update
+apt-get -yq update
+apt-get -yq dist-upgrade
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index a519b30d..6168f4bf 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -72,6 +72,9 @@
         {
             "type": "shell",
             "script": "{{template_dir}}/scripts/base/apt.sh",
+            "environment_vars": [
+                "DEBIAN_FRONTEND=noninteractive"
+            ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
         {
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 977464e3..6fc3f813 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -75,6 +75,9 @@
         {
             "type": "shell",
             "script": "{{template_dir}}/scripts/base/apt.sh",
+            "environment_vars": [
+                "DEBIAN_FRONTEND=noninteractive"
+            ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
         {
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 54bc6fb5..bde4024c 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -74,9 +74,20 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
+        {
+            "type": "shell",
+            "expect_disconnect": true,
+            "scripts": [
+                "{{template_dir}}/scripts/base/reboot.sh"
+            ],
+            "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "script": "{{template_dir}}/scripts/base/apt.sh",
+            "environment_vars": [
+                "DEBIAN_FRONTEND=noninteractive"
+            ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
         {

From 0d2d9aed37c5c8bbc2f4ebb75e16ded09e09b4bd Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Thu, 5 Nov 2020 18:49:43 +0300
Subject: [PATCH 16/44] Fix pypy url

---
 images/macos/provision/core/pypy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh
index 8a373f4c..2fc9bc1a 100644
--- a/images/macos/provision/core/pypy.sh
+++ b/images/macos/provision/core/pypy.sh
@@ -13,7 +13,7 @@ function InstallPyPy
     PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}')
     echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'"
     PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME"
-    download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "PACKAGE_TAR_NAME"
+    download_with_retries $PACKAGE_URL "/tmp" "PACKAGE_TAR_NAME"
 
     echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder"
     tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp

From 0269bec6f466b9ff76a8b2e89e546640b0fced52 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Thu, 5 Nov 2020 22:08:19 +0300
Subject: [PATCH 17/44] grep first entry of PATH

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

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 4202469d..c14c00d7 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER
 chmod 755 $IMAGE_FOLDER
 
 # Remove quotes around PATH
-ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//')
+ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//')
 ENVPATH=${ENVPATH#"\""}
 ENVPATH=${ENVPATH%"\""}
 echo "PATH=$ENVPATH" | sudo tee -a /etc/environment

From 567e92c4dc955fe8d19390b241f5e3467bb7d7e8 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Thu, 5 Nov 2020 23:01:06 +0300
Subject: [PATCH 18/44] [Ubuntu] Freeze Az.Accounts module for Ubuntu 20
 (#1993)

* add reboot for Ubuntu20

* freeze Az.Accounts 1.9.5
---
 images/linux/scripts/installers/azpowershell.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index 13253b5f..f18492c5 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -18,6 +18,10 @@ pwsh -Command "Update-Module -Name PowerShellGet -Force"
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
 for version in ${versions[@]}; do
     pwsh -Command "Save-Module -Name Az -LiteralPath /usr/share/az_$version -RequiredVersion $version -Force -Verbose"
+    if isUbuntu20; then
+        rm -rf "/usr/share/az_$version/Az.Accounts"
+        pwsh -Command "Save-Module -Name Az.Accounts -LiteralPath /usr/share/az_$version -RequiredVersion 1.9.5 -Force -Verbose"
+    fi
 done
 
 # Run tests to determine that the software installed as expected

From 45b33107cde77c43cfe3f8dc69aa1658d6c73a35 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Fri, 6 Nov 2020 00:33:39 +0300
Subject: [PATCH 19/44] Fix brew repository permissions to make it clean

---
 images/linux/scripts/installers/post-deployment.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index c14c00d7..15f3ebd8 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -24,6 +24,10 @@ ENVPATH=${ENVPATH%"\""}
 echo "PATH=$ENVPATH" | sudo tee -a /etc/environment
 echo "Updated /etc/environment: $(cat /etc/environment)"
 
+# Fix brew repository permissions to make it clean
+cd $(brew --prefix)/Homebrew
+git reset --hard
+
 # Clean yarn and npm cache
 yarn cache clean
 npm cache clean --force
\ No newline at end of file

From 981df9e44fdb7e897bcf2f25696625f0a468c246 Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
Date: Fri, 6 Nov 2020 00:56:14 +0300
Subject: [PATCH 20/44] revert brew fix

---
 images/linux/scripts/installers/post-deployment.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
index 15f3ebd8..c14c00d7 100644
--- a/images/linux/scripts/installers/post-deployment.sh
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -24,10 +24,6 @@ ENVPATH=${ENVPATH%"\""}
 echo "PATH=$ENVPATH" | sudo tee -a /etc/environment
 echo "Updated /etc/environment: $(cat /etc/environment)"
 
-# Fix brew repository permissions to make it clean
-cd $(brew --prefix)/Homebrew
-git reset --hard
-
 # Clean yarn and npm cache
 yarn cache clean
 npm cache clean --force
\ No newline at end of file

From 397cd6cee7e34ce64f262e2ecf1fb2edf3c5e88a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2020 22:22:40 +0000
Subject: [PATCH 21/44] Updating readme file for ubuntu18 version 20201102.0
 (#1966)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>
---
 images/linux/Ubuntu1804-README.md | 54 ++++++++++++++++---------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index 68dd9422..3c21237a 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,11 +1,13 @@
 | Announcements |
 |-|
+| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
+| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
 | [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) |
 | [[Ubuntu] [Windows] Boost 1.69.0 will be deprecated on November, 10](https://github.com/actions/virtual-environments/issues/1847) |
 | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) |
 ***
 # Ubuntu 18.04.5 LTS
-- Image Version: 20201026.1
+- Image Version: 20201102.0
 
 ## Installed Software
 ### Language and Runtime
@@ -14,7 +16,7 @@
 - Clang 6.0.0, 8.0.0, 9.0.0
 - Erlang 11.1
 - Mono 6.12.0.90
-- Node 12.19.0
+- Node 14.15.0
 - Python 2.7.17
 - Python3 3.6.9
 - PowerShell 7.0.3
@@ -24,8 +26,8 @@
 
 ### Package Management
 - Gem 3.1.4
-- Helm 3.3.4
-- Homebrew 2.5.6
+- Helm 3.4.0
+- Homebrew 2.5.8
 - Miniconda 4.8.3
 - Npm 6.14.8
 - Pip 9.0.1
@@ -50,29 +52,29 @@
 - Bazelisk 1.7.3
 - Buildah 1.16.4
 - CMake 3.17.0
-- CodeQL Action Bundle 2.3.0
+- CodeQL Action Bundle 2.3.1+202010222007
 - curl 7.58.0
 - Docker Compose 1.27.4
 - Docker-Buildx 0.4.2
 - Docker-Moby 19.03.13
-- Git 2.29.0
+- Git 2.29.2
 - Git LFS 2.12.0
 - Git-ftp 1.3.1
-- Google Cloud SDK 315.0.0
+- Google Cloud SDK 316.0.0
 - Haveged 1.9.1
-- Heroku 7.46.2
-- HHVM (HipHop VM) 4.80.0
+- Heroku 7.47.0
+- HHVM (HipHop VM) 4.81.0
 - jq 1.5
 - Kind 0.9.0
 - Kubectl 1.19.3
-- Kustomize 3.8.5
+- Kustomize 3.8.6
 - Leiningen 2.9.4
 - m4 1.4.18
 - Mercurial 4.5.3
-- Minikube 1.14.1
-- Newman 5.2.0
+- Minikube 1.14.2
+- Newman 5.2.1
 - nvm 0.36.0
-- Packer 1.6.4
+- Packer 1.6.5
 - PhantomJS 2.1.1
 - Podman 2.1.1
 - Pulumi 2.12.1
@@ -90,14 +92,14 @@
 
 ### CLI Tools
 - Alibaba Cloud CLI 3.0.60
-- AWS CLI 1.18.164
+- AWS CLI 1.18.169
 - AWS CLI Session manager plugin 1.2.7.0
-- AWS SAM CLI 1.6.2
-- Azure CLI (azure-cli) 2.13.0
+- AWS SAM CLI 1.7.0
+- Azure CLI (azure-cli) 2.14.0
 - Azure CLI (azure-devops) 0.18.0
-- GitHub CLI 1.1.0
+- GitHub CLI 1.2.0
 - Hub CLI 2.14.2
-- Netlify CLI 2.65.7
+- Netlify CLI 2.67.2
 - oc CLI 4.5.0
 - ORAS CLI 0.8.1
 - Vercel CLI 20.1.2
@@ -113,8 +115,8 @@
 ### PHP
 | Tool     | Version                     |
 | -------- | --------------------------- |
-| PHP      | 7.1.33 7.2.34 7.3.23 7.4.11 |
-| Composer | 2.0.2                       |
+| PHP      | 7.1.33 7.2.34 7.3.24 7.4.12 |
+| Composer | 2.0.4                       |
 | PHPUnit  | 7.5.20                      |
 
 ### Haskell
@@ -130,14 +132,14 @@
 
 #### Packages
 - Bindgen 0.55.1
-- Cargo audit 0.12.1
-- Cargo outdated 0.9.11
+- Cargo audit 0.13.1
+- Cargo outdated 0.9.13
 - Cargo clippy 0.0.212
 - Cbindgen 0.15.0
 - Rustfmt 1.4.20
 
 ### Browsers and Drivers
-- Google Chrome 86.0.4240.111
+- Google Chrome 86.0.4240.183
 - ChromeDriver 86.0.4240.22
 - Mozilla Firefox 82.0
 - Geckodriver 0.27.0
@@ -154,7 +156,7 @@
 - sqlite3 3.22.0
 
 #### MySQL
-- MySQL 5.7.31
+- MySQL 5.7.32
 - MySQL Server (user:root password:root)
 - MS SQL Server Client Tools
 
@@ -182,9 +184,9 @@
 
 #### Node.js
 - 8.17.0
-- 10.22.1
+- 10.23.0
 - 12.19.0
-- 14.14.0
+- 14.15.0
 
 #### Go
 - 1.11.13

From adbd8a74dc68c23a81bf7be94c93dbc4f08929ee Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Fri, 6 Nov 2020 02:05:48 +0300
Subject: [PATCH 22/44] add brew git reset

---
 images/linux/post-generation/homebrew-permissions.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/linux/post-generation/homebrew-permissions.sh b/images/linux/post-generation/homebrew-permissions.sh
index edd15fb7..28a8a6ee 100644
--- a/images/linux/post-generation/homebrew-permissions.sh
+++ b/images/linux/post-generation/homebrew-permissions.sh
@@ -3,6 +3,10 @@
 # Fix permissions for Homebrew
 # https://github.com/actions/virtual-environments/issues/1568
 
+# Reset brew repository directory to make the brew clean after chmoding /home
+cd $(brew --prefix)/Homebrew
+git reset --hard
+
 brew_folder="/home/linuxbrew/"
 homebrew_user=$(cut -d: -f1 /etc/passwd | tail -1)
 

From f07a74c6941110a022a2a4e5621fa2c1f60a70bc Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Fri, 6 Nov 2020 02:34:47 +0300
Subject: [PATCH 23/44] update driver

---
 images/win/scripts/Installers/Install-WinAppDriver.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/win/scripts/Installers/Install-WinAppDriver.ps1 b/images/win/scripts/Installers/Install-WinAppDriver.ps1
index 38745dd9..b33ff907 100644
--- a/images/win/scripts/Installers/Install-WinAppDriver.ps1
+++ b/images/win/scripts/Installers/Install-WinAppDriver.ps1
@@ -3,8 +3,8 @@
 ##  Desc:  Install Windows Application Driver (WinAppDriver)
 ####################################################################################
 
-$InstallerName = "WindowsApplicationDriver.msi"
-$InstallerUrl = "https://github.com/Microsoft/WinAppDriver/releases/download/v1.1/${InstallerName}"
+$InstallerName = "WindowsApplicationDriver_1.2.1.msi"
+$InstallerUrl = "https://github.com/Microsoft/WinAppDriver/releases/download/v1.2.1/${InstallerName}"
 
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 Install-Binary -Url $InstallerUrl -Name $InstallerName

From b084d6241b18f131e3089d4b924dd3733a22ddf6 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Fri, 6 Nov 2020 02:52:23 +0300
Subject: [PATCH 24/44] Always install latest version

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

diff --git a/images/win/scripts/Installers/Install-WinAppDriver.ps1 b/images/win/scripts/Installers/Install-WinAppDriver.ps1
index b33ff907..a2a1dd3d 100644
--- a/images/win/scripts/Installers/Install-WinAppDriver.ps1
+++ b/images/win/scripts/Installers/Install-WinAppDriver.ps1
@@ -3,8 +3,9 @@
 ##  Desc:  Install Windows Application Driver (WinAppDriver)
 ####################################################################################
 
-$InstallerName = "WindowsApplicationDriver_1.2.1.msi"
-$InstallerUrl = "https://github.com/Microsoft/WinAppDriver/releases/download/v1.2.1/${InstallerName}"
+$LatestReleaseUrl = 'https://api.github.com/repos/microsoft/WinAppDriver/releases/latest'
+$InstallerUrl = (Invoke-RestMethod -Uri $LatestReleaseUrl).assets.browser_download_url
+$InstallerName = "WindowsApplicationDriver.msi"
 
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 Install-Binary -Url $InstallerUrl -Name $InstallerName

From b4c00c3578ae115ca1b5b0133e851997a06d3239 Mon Sep 17 00:00:00 2001
From: Alena Sviridenko <alenasviridenko@github.com>
Date: Fri, 6 Nov 2020 02:56:26 +0300
Subject: [PATCH 25/44] [macOS] Add Xcode 12.1.1 RC  & Xcode 12.2 RC (#1991)

* Add Xcode 12.1.1

* add Xcode 12.2 RC as well
---
 images/macos/provision/utils/xcode-utils.sh | 7 -------
 images/macos/toolsets/toolset-10.15.json    | 2 +-
 images/macos/toolsets/toolset-11.0.json     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index 4955ffcd..cfe93439 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -9,11 +9,6 @@ createXamarinProvisionatorSymlink() {
         FULL_VERSION="12.0.1"
     fi
 
-    # temporary trick for 12.1.1
-    if [[ $XCODE_VERSION == "12.1" ]]; then
-        FULL_VERSION="12.1.1"
-    fi
-
     if [ $FULL_VERSION != $XCODE_VERSION ]; then
         ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${FULL_VERSION}.app"
     fi
@@ -24,8 +19,6 @@ getXcodeVersionToInstall() {
 
     if [[ $XCODE_VERSION == "12" ]]; then
         echo "12.0.1"
-    elif [[ $XCODE_VERSION == "12.1" ]]; then
-        echo "12.1.1 Release Candidate"
     elif [[ ! $XCODE_VERSION =~ "_beta" ]]; then
         echo "${XCODE_VERSION//_/ }"
     else
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 79f6d9eb..a2edef7a 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -2,7 +2,7 @@
     "xcode": {
         "default": "12",
         "versions": [
-            "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
+            "12.2_Release_Candidate", "12.1.1_Release_Candidate", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.3.1", "11.2.1", "10.3"
         ]
     },
     "xamarin": {
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index 874dec12..7fedaad5 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -2,7 +2,7 @@
     "xcode": {
         "default": "11.7",
         "versions": [
-            "12.2_beta", "11.7"
+            "12.2_Release_Candidate", "11.7"
         ]
     },
     "xamarin": {

From 25239b51567b86c3e6723fc2c7f7ebbd50ec968b Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sun, 1 Nov 2020 04:14:38 +0530
Subject: [PATCH 26/44] Add php-dev and php-pear (#1944)

---
 images/linux/scripts/installers/php.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh
index b8e2b8ed..5abbb4b5 100644
--- a/images/linux/scripts/installers/php.sh
+++ b/images/linux/scripts/installers/php.sh
@@ -66,7 +66,6 @@ for version in $php_versions; do
 
     if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then
         apt-fast install -y --no-install-recommends php$version-mcrypt php$version-recode
-        apt-get remove --purge -yq php$version-dev
     fi
 
     if [[ $version == "7.2" || $version == "7.3" ]]; then
@@ -81,13 +80,12 @@ apt-fast install -y --no-install-recommends \
     php-memcache \
     php-memcached \
     php-mongodb \
+    php-pear \
     php-redis \
     php-xdebug \
     php-yaml \
     php-zmq
 
-apt-get remove --purge -yq php7.2-dev
-
 apt-fast install -y --no-install-recommends snmp
 
 # Install composer
@@ -113,17 +111,23 @@ mv phpunit /usr/local/bin/phpunit
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
-for cmd in php $php_versions composer phpunit; do
-    if [[ $cmd =~ ^[0-9] ]]; then
-        cmd="php$cmd"
-    fi
-
+for cmd in composer pear pecl phpunit; do
     if ! command -v $cmd; then
         echo "$cmd was not installed"
         exit 1
     fi
 done
 
+for version in $php_versions; do
+    if ! command -v php$version; then
+        echo "php$version was not installed"
+        exit 1
+    elif ! command -v php-config$version || ! command -v phpize$version; then
+        echo "php$version-dev was not installed"
+        exit 1
+    fi
+done
+
 # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php
 # see https://github.com/actions/virtual-environments/issues/1084
 if isUbuntu20 ; then

From 1ac24689ce5100268d7166ce49cdd01717333e9c Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Fri, 6 Nov 2020 08:22:54 +0300
Subject: [PATCH 27/44] Fix pypy package name

---
 images/macos/provision/core/pypy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh
index 2fc9bc1a..51f0f6ba 100644
--- a/images/macos/provision/core/pypy.sh
+++ b/images/macos/provision/core/pypy.sh
@@ -13,7 +13,7 @@ function InstallPyPy
     PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}')
     echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'"
     PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME"
-    download_with_retries $PACKAGE_URL "/tmp" "PACKAGE_TAR_NAME"
+    download_with_retries $PACKAGE_URL "/tmp" "$PACKAGE_TAR_NAME"
 
     echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder"
     tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp

From 642380275e1842f1819463cbbf2076b80c49ecf1 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <v-mitim@microsoft.com>
Date: Fri, 6 Nov 2020 14:38:47 +0300
Subject: [PATCH 28/44] simplify cd

---
 images/linux/post-generation/homebrew-permissions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/post-generation/homebrew-permissions.sh b/images/linux/post-generation/homebrew-permissions.sh
index 28a8a6ee..b19947b4 100644
--- a/images/linux/post-generation/homebrew-permissions.sh
+++ b/images/linux/post-generation/homebrew-permissions.sh
@@ -4,7 +4,7 @@
 # https://github.com/actions/virtual-environments/issues/1568
 
 # Reset brew repository directory to make the brew clean after chmoding /home
-cd $(brew --prefix)/Homebrew
+cd $(brew --repo)
 git reset --hard
 
 brew_folder="/home/linuxbrew/"

From fa9109cc62be11105688bc7aa2305864a9dc762c Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <maxim-lobanov@github.com>
Date: Fri, 6 Nov 2020 22:13:28 +0300
Subject: [PATCH 29/44] [MacOS] Exclude release candidates from
 XCODE_DEVELOPER_DIR variables (#1998)

* exclude release candidates from XCODE_DEVELOPER_DIR

* Update Xcode.Tests.ps1
---
 images/macos/provision/utils/xcode-utils.sh | 2 +-
 images/macos/tests/Xcode.Tests.ps1          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/macos/provision/utils/xcode-utils.sh b/images/macos/provision/utils/xcode-utils.sh
index cfe93439..a5874c6f 100644
--- a/images/macos/provision/utils/xcode-utils.sh
+++ b/images/macos/provision/utils/xcode-utils.sh
@@ -55,7 +55,7 @@ runFirstLaunch() {
 }
 
 setXcodeDeveloperDirVariables() {
-    stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta")
+    stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta" | grep -v "Release_Candidate")
     major_versions=($(echo ${stable_xcode_versions[@]} | tr " " "\n" | cut -d '.' -f 1 | uniq))
     for MAJOR_VERSION in "${major_versions[@]}"
     do
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index 250c8d8a..b00ab298 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -56,7 +56,7 @@ Describe "Xcode" {
     }
 
     Context "XCODE_DEVELOPER_DIR" {
-        $stableXcodeVersions = $XCODE_VERSIONS | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ }
+        $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ }
         $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique
         $testCases = $majorXcodeVersions | ForEach-Object {
             $majorXcodeVersion = $_
@@ -84,7 +84,7 @@ Describe "Xcode" {
 }
 
 Describe "Xcode simulators" {
-    $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object {
+    $XCODE_VERSIONS | Where-Object { $_ -notlike "*Release*Candidate*" } | ForEach-Object { $_.Split("_")[0] } | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object {
         Switch-Xcode -Version $_
 
         Context "$_" {

From 8d3568601bc448eb288d90b524b66971ae111bec Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Mon, 9 Nov 2020 11:17:28 +0300
Subject: [PATCH 30/44] Move nuget.exe from tmp to mono dir

---
 images/macos/provision/utils/xamarin-utils.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh
index c6b66a1e..6de156af 100644
--- a/images/macos/provision/utils/xamarin-utils.sh
+++ b/images/macos/provision/utils/xamarin-utils.sh
@@ -197,6 +197,7 @@ installNuget() {
   pushd $TMPMOUNT
   download_with_retries $NUGET_URL "." "nuget.exe"
   sudo chmod a+x nuget.exe
+  sudo nuget.exe ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
   popd
 }
 

From ffcfad23bec7d358af6aea6e27f0fc7e974e45e5 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Mon, 9 Nov 2020 11:18:42 +0300
Subject: [PATCH 31/44] Minor fix

---
 images/macos/provision/utils/xamarin-utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh
index 6de156af..a004fd76 100644
--- a/images/macos/provision/utils/xamarin-utils.sh
+++ b/images/macos/provision/utils/xamarin-utils.sh
@@ -197,7 +197,7 @@ installNuget() {
   pushd $TMPMOUNT
   download_with_retries $NUGET_URL "." "nuget.exe"
   sudo chmod a+x nuget.exe
-  sudo nuget.exe ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
+  sudo mv nuget.exe ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget
   popd
 }
 

From 3a9390dcbccecd91a04c7bd6c3ebc7cbd0d0f696 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Mon, 9 Nov 2020 11:25:04 +0300
Subject: [PATCH 32/44] download to /tmp for azcopy and aws

---
 images/macos/provision/core/aws.sh    | 5 +++--
 images/macos/provision/core/azcopy.sh | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index f015f6fc..afce1d3d 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -4,9 +4,10 @@ source ~/utils/utils.sh
 
 echo Installing aws...
 AWSCLIURL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
-download_with_retries $AWSCLIURL "."
+download_with_retries $AWSCLIURL "/tmp"
+pushd /tmp
 sudo installer -pkg AWSCLIV2.pkg -target /
-rm -rf AWSCLIV2.pkg
+popd
 
 echo Installing aws sam cli...
 brew tap aws/tap
diff --git a/images/macos/provision/core/azcopy.sh b/images/macos/provision/core/azcopy.sh
index 8325c803..bf6e0541 100755
--- a/images/macos/provision/core/azcopy.sh
+++ b/images/macos/provision/core/azcopy.sh
@@ -4,8 +4,8 @@ source ~/utils/utils.sh
 
 AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac"
 
-download_with_retries $AZCOPY_DOWNLOAD_URL "." "azcopy.zip"
-unzip azcopy.zip -d azcopy
+download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "azcopy.zip"
+unzip /tmp/azcopy.zip -d azcopy
 AZCOPY_EXTRACTED=$(echo azcopy/azcopy*)
 cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy"
 chmod +x "/usr/local/bin/azcopy"

From 7c9f3de0d7cd8e25989a38e5a728ba67a62e361e Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Mon, 9 Nov 2020 11:49:16 +0300
Subject: [PATCH 33/44] Minor fix

---
 images/macos/provision/core/aws.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index afce1d3d..fe66a635 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -3,8 +3,8 @@
 source ~/utils/utils.sh
 
 echo Installing aws...
-AWSCLIURL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
-download_with_retries $AWSCLIURL "/tmp"
+AWS_CLI_URL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
+download_with_retries $AWS_CLI_URL "/tmp"
 pushd /tmp
 sudo installer -pkg AWSCLIV2.pkg -target /
 popd

From 7c13be802f863ffc17952c5eceacc6200eacf172 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 12:59:02 +0000
Subject: [PATCH 34/44] Updating readme file for macOS-11.0 version 20201107.1
 (#2016)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
---
 images/macos/macos-11.0-Readme.md | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md
index e36ef538..b3d72603 100644
--- a/images/macos/macos-11.0-Readme.md
+++ b/images/macos/macos-11.0-Readme.md
@@ -2,14 +2,14 @@
 |-|
 | [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
 | [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
-| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) |
+| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) |
 | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
 | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
 ***
 # macOS 11.0 info
 - System Version: macOS 11.0 (20A5395g)
 - Kernel Version: Darwin 20.1.0
-- Image Version: 20201102.1
+- Image Version: 20201107.1
 
 ## Installed Software
 ### Language and Runtime
@@ -18,8 +18,8 @@
 - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
 - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0  - available by `gfortran-8` alias
 - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0  - available by `gfortran-9` alias
-- Node.js v12.19.0
-- NVM 0.36.0
+- Node.js v14.15.0
+- NVM 0.37.0
 - NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0
 - Python 2.7.17
 - Python 3.8.6
@@ -42,7 +42,7 @@
 - NuGet 5.6.0.6489
 - Miniconda 4.8.3
 - RubyGems 3.1.4
-- Composer 2.0.4
+- Composer 2.0.6
 
 ### Project Management
 - Apache Maven 3.6.3
@@ -52,7 +52,7 @@
 ### Utilities
 - Curl 7.73.0
 - Git: 2.29.2
-- Git LFS: 2.12.0
+- Git LFS: 2.12.1
 - GitHub CLI: 1.2.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
@@ -64,7 +64,7 @@
 - psql (PostgreSQL) 13.0
 - PostgreSQL 13.0
 - aria2 1.35.0
-- azcopy 10.6.1
+- azcopy 10.7.0
 - zstd 1.4.5
 - bazel 3.7.0
 - bazelisk 1.7.4
@@ -75,12 +75,12 @@
 - Newman 5.2.1
 
 ### Tools
-- Fastlane 2.165.0
+- Fastlane 2.166.0
 - Cmake 3.18.4
 - App Center CLI 2.7.3
-- Azure CLI 2.14.0
-- AWS CLI 2.0.61
-- AWS SAM CLI 1.7.0
+- Azure CLI 2.14.1
+- AWS CLI 2.0.62
+- AWS SAM CLI 1.8.0
 - AWS Session Manager CLI 1.2.7.0
 - Aliyun CLI 3.0.60
 - GHCup v0.1.11
@@ -97,8 +97,8 @@
 - SafariDriver 14.0.1 (16610.2.8.1.1)
 - Google Chrome 86.0.4240.183 
 - ChromeDriver 86.0.4240.22
-- Microsoft Edge 86.0.622.58 
-- MSEdgeDriver 86.0.622.58
+- Microsoft Edge 86.0.622.63 
+- MSEdgeDriver 86.0.622.63
 - Mozilla Firefox 82.0.2
 - geckodriver 0.27.0
 
@@ -125,7 +125,7 @@
 - 14.15.0
 
 #### Go
-- 1.15.3
+- 1.15.4
 
 ### Rust Tools
 - Rust 1.47.0
@@ -171,7 +171,7 @@
 ### Xcode
 | Version        | Build    | Path                         |
 | -------------- | -------- | ---------------------------- |
-| 12.2 (beta)    | 12B5035g | /Applications/Xcode_12.2.app |
+| 12.2 (beta)    | 12B5044c | /Applications/Xcode_12.2.app |
 | 11.7 (default) | 11E801a  | /Applications/Xcode_11.7.app |
 
 #### Xcode Support Tools
@@ -214,7 +214,7 @@
 | Android SDK Tools          | 26.1.1                                                                                                            |
 | Android SDK Platforms      | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)                              |
 | Android SDK Build-tools    | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 |
-| Android SDK Platform-Tools | 30.0.4                                                                                                            |
+| Android SDK Platform-Tools | 30.0.5                                                                                                            |
 | Android Support Repository | 47.0.0                                                                                                            |
 | Google Play services       | 49                                                                                                                |
 | Google Repository          | 58                                                                                                                |

From 80d67ba1b12f9570a51f2e690af7e6e6283d471c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 16:22:01 +0000
Subject: [PATCH 35/44] Updating readme file for macOS-10.13 version 20201107.1
 (#2013)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>
---
 images/macos/macos-10.13-Readme.md | 74 +++++++++++++++---------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/images/macos/macos-10.13-Readme.md b/images/macos/macos-10.13-Readme.md
index da35d0f7..b2fc7317 100644
--- a/images/macos/macos-10.13-Readme.md
+++ b/images/macos/macos-10.13-Readme.md
@@ -1,42 +1,44 @@
 | Announcements |
 |-|
+| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
+| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
+| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) |
 | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
-| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
-| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
 | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
 ***
 # macOS 10.13 info
 - System Version: macOS 10.13.6 (17G14033)
 - Kernel Version: Darwin 17.7.0
-- Image Version: 20201015.3
+- Image Version: 20201107.1
 
 ## Installed Software
 ### Language and Runtime
 - R 4.0.3
 - Node.js v8.17.0
-- NVM 0.36.0
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
+- NVM 0.37.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0
 - Python 2.7.17
 - Python 3.8.6
-- Ruby 2.6.6p146
+- Ruby 2.7.2p137
 - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507
-- Go 1.15.2
-- PHP 7.4.11
+- Go 1.15.3
+- PHP 7.4.12
 - julia 1.5.2
 
 ### Package Management
 - Pip 19.3.1 (python 2.7)
-- Pip 20.2.3 (python 3.8)
+- Pip 20.2.4 (python 3.8)
+- Pipx 0.15.6.0
 - Bundler version 2.1.4
 - Carthage 0.36.0
-- CocoaPods 1.9.3
-- Homebrew 2.5.6
+- CocoaPods 1.10.0
+- Homebrew 2.5.8
 - NPM 3.10.10
 - Yarn 1.22.5
 - NuGet 4.7.0.5148
 - Miniconda 4.8.3
 - RubyGems 3.1.4
-- Composer 1.10.15
+- Composer 2.0.6
 
 ### Project Management
 - Apache Maven 3.6.3
@@ -45,59 +47,59 @@
 
 ### Utilities
 - Curl 7.73.0
-- Git: 2.28.0
-- Git LFS: 2.12.0
-- GitHub CLI: 1.1.0
+- Git: 2.29.2
+- Git LFS: 2.12.1
+- GitHub CLI: 1.2.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
 - Subversion (SVN) 1.14.0
-- Packer 1.6.4
+- Packer 1.6.5
 - OpenSSL 1.0.2t  10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)`
 - jq 1.6
 - gpg (GnuPG) 2.2.23
 - psql (PostgreSQL) 13.0
 - PostgreSQL 13.0
 - aria2 1.35.0
-- azcopy 10.6.0
+- azcopy 10.7.0
 - zstd 1.4.5
-- bazel 3.6.0
-- bazelisk 1.7.2
-- helm v3.3.4+ga61ce56
+- bazel 3.7.0
+- bazelisk 1.7.4
+- helm v3.4.0+g7090a89
 - mongo v4.4.1
 - mongod v4.4.1
 - 7-Zip 16.02
-- virtualbox 6.1.14r140239
+- virtualbox 6.1.16r140961
 - Vagrant 2.2.10
-- GNU parallel 20200722
+- GNU parallel 20201022
 
 
 ### Tools
-- Fastlane 2.163.0
+- Fastlane 2.166.0
 - Cmake 3.18.4
 - App Center CLI 1.2.2
-- Azure CLI 2.13.0
-- AWS CLI 2.0.56
-- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.0
+- Azure CLI 2.14.1
+- AWS CLI 2.0.62
+- AWS SAM CLI 1.8.0
+- AWS Session Manager CLI 1.2.7.0
 - Aliyun CLI 3.0.60
 ### Linters
 - yamllint 1.25.0
 ### Browsers
 - Safari 13.1.2 (13609.3.5.1.5)
 - SafariDriver 13.1.2 (13609.3.5.1.5)
-- Google Chrome 86.0.4240.80 
+- Google Chrome 86.0.4240.183 
 - ChromeDriver 86.0.4240.22
-- Microsoft Edge 85.0.564.70 
-- MSEdgeDriver 85.0.564.70
-- Mozilla Firefox 81.0.2
+- Microsoft Edge 86.0.622.63 
+- MSEdgeDriver 86.0.622.63
+- Mozilla Firefox 82.0.2
 - geckodriver 0.27.0
 
 ### Java
 | Version   | Vendor       | Environment Variable |
 | --------- | ------------ | -------------------- |
-| 1.7.0_272 | Zulu         | JAVA_HOME_7_X64      |
-| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64      |
-| 11.0.8    | AdoptOpenJDK | JAVA_HOME_11_X64     |
+| 1.7.0_282 | Zulu         | JAVA_HOME_7_X64      |
+| 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64      |
+| 11.0.9    | AdoptOpenJDK | JAVA_HOME_11_X64     |
 | 12.0.2    | AdoptOpenJDK | JAVA_HOME_12_X64     |
 | 13.0.2    | AdoptOpenJDK | JAVA_HOME_13_X64     |
 | 14.0.2    | AdoptOpenJDK | JAVA_HOME_14_X64     |
@@ -222,7 +224,7 @@
 
 #### Xcode Support Tools
 - xcpretty 0.3.0
-- xcversion 2.6.6
+- xcversion 2.6.7
 - Nomad CLI 3.1.4
 - Nomad CLI IPA ipa 0.14.3
 - xctool 0.3.7
@@ -339,7 +341,7 @@
 | Android SDK Tools          | 26.1.1                                                                                                                                                                                                                                                                                                                                                                                        |
 | Android SDK Platforms      | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4)<br>android-18 (rev 3)<br>android-17 (rev 3)<br>android-16 (rev 5)<br>android-15 (rev 5)                                  |
 | Android SDK Build-tools    | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 23.0.0<br>22.0.1 22.0.0<br>21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1<br>20.0.0<br>19.1.0 19.0.0 19.0.1 19.0.2 19.0.3<br>18.0.1 18.1.0 18.1.1<br>17.0.0 |
-| Android SDK Platform-Tools | 30.0.4                                                                                                                                                                                                                                                                                                                                                                                        |
+| Android SDK Platform-Tools | 30.0.5                                                                                                                                                                                                                                                                                                                                                                                        |
 | Google APIs                | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24                                                                                                                                                                                                                                                                      |
 | Android Support Repository | 47.0.0                                                                                                                                                                                                                                                                                                                                                                                        |
 | Google Play services       | 49                                                                                                                                                                                                                                                                                                                                                                                            |

From f412ec4c2654bb929c04a3c4676f7559c106f9a0 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Mon, 9 Nov 2020 20:07:01 +0300
Subject: [PATCH 36/44] Minor fix

---
 images/macos/provision/core/aws.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh
index fe66a635..c1cb882b 100644
--- a/images/macos/provision/core/aws.sh
+++ b/images/macos/provision/core/aws.sh
@@ -5,9 +5,7 @@ source ~/utils/utils.sh
 echo Installing aws...
 AWS_CLI_URL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
 download_with_retries $AWS_CLI_URL "/tmp"
-pushd /tmp
-sudo installer -pkg AWSCLIV2.pkg -target /
-popd
+sudo installer -pkg /tmp/AWSCLIV2.pkg -target /
 
 echo Installing aws sam cli...
 brew tap aws/tap

From 3250f193144cd81e3b571661e3152915f9933a49 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Tue, 10 Nov 2020 09:31:57 +0300
Subject: [PATCH 37/44] cleanup /tmp explicitly

---
 images/macos/provision/configuration/finalize-vm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh
index e3c4de7f..3c8dd603 100644
--- a/images/macos/provision/configuration/finalize-vm.sh
+++ b/images/macos/provision/configuration/finalize-vm.sh
@@ -30,7 +30,7 @@ npm cache clean --force
 yarn cache clean
 
 # Clean up temporary directories
-rm -rf ~/utils ~/image-generation
+rm -rf ~/utils ~/image-generation /tmp/*
 
 # Erase all indexes and wait until the rebuilding process ends,
 # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish

From b99c150f414937965b2c626d56e146664203e34f Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Tue, 10 Nov 2020 11:30:12 +0300
Subject: [PATCH 38/44] Off turns off the update notification feature

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

diff --git a/images/win/scripts/Installers/Install-PowershellCore.ps1 b/images/win/scripts/Installers/Install-PowershellCore.ps1
index 1e620c74..f968ebf9 100644
--- a/images/win/scripts/Installers/Install-PowershellCore.ps1
+++ b/images/win/scripts/Installers/Install-PowershellCore.ps1
@@ -5,4 +5,10 @@
 
 Invoke-Expression "& { $(Invoke-RestMethod https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet"
 
+# about_update_notifications
+# While the update check happens during the first session in a given 24-hour period, for performance reasons,
+# the notification will only be shown on the start of subsequent sessions.
+# Also for performance reasons, the check will not start until at least 3 seconds after the session begins.
+[System.Environment]::SetEnvironmentVariable("POWERSHELL_UPDATECHECK", "Off", [System.EnvironmentVariableTarget]::Machine)
+
 Invoke-PesterTests -TestFile "Tools" -TestName "PowerShell Core"

From 4ce27ca4461f5827f5577086075a6b84ea825f5e Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@gmail.com>
Date: Tue, 10 Nov 2020 12:44:58 +0300
Subject: [PATCH 39/44] sudo for cleanup temporary dirs

---
 images/macos/provision/configuration/finalize-vm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh
index 3c8dd603..67f1949c 100644
--- a/images/macos/provision/configuration/finalize-vm.sh
+++ b/images/macos/provision/configuration/finalize-vm.sh
@@ -30,7 +30,7 @@ npm cache clean --force
 yarn cache clean
 
 # Clean up temporary directories
-rm -rf ~/utils ~/image-generation /tmp/*
+sudo rm -rf ~/utils ~/image-generation /tmp/*
 
 # Erase all indexes and wait until the rebuilding process ends,
 # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish

From 562100df60132acd5da0974d3f06478a7bcfb91a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 14:48:01 +0000
Subject: [PATCH 40/44] Updating readme file for macOS-10.14 version 20201106.2
 (#2011)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>
---
 images/macos/macos-10.14-Readme.md | 92 +++++++++++++++---------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md
index e8fa2cac..34999f6f 100644
--- a/images/macos/macos-10.14-Readme.md
+++ b/images/macos/macos-10.14-Readme.md
@@ -1,47 +1,49 @@
 | Announcements |
 |-|
+| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
+| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
+| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) |
 | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
-| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
-| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
 | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
 ***
 # macOS 10.14 info
 - System Version: macOS 10.14.6 (18G6032)
 - Kernel Version: Darwin 18.7.0
-- Image Version: 20201018.1
+- Image Version: 20201106.2
 
 ## Installed Software
 ### Language and Runtime
-- Clang/LLVM 10.0.1
+- Clang/LLVM 11.0.0
 - gcc-8 (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gcc-8` alias
 - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias
 - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0  - available by `gfortran-8` alias
 - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0  - available by `gfortran-9` alias
 - R 4.0.3
 - Node.js v8.17.0
-- NVM 0.36.0
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
+- NVM 0.37.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0
 - Python 2.7.17
 - Python 3.8.6
-- Ruby 2.6.6p146
+- Ruby 2.7.2p137
 - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507
 - Go 1.15.3
-- PHP 7.4.11
+- PHP 7.4.12
 - julia 1.5.2
 
 ### Package Management
 - Pip 19.3.1 (python 2.7)
-- Pip 20.2.3 (python 3.8)
+- Pip 20.2.4 (python 3.8)
+- Pipx 0.15.6.0
 - Bundler version 2.1.4
 - Carthage 0.36.0
-- CocoaPods 1.9.3
-- Homebrew 2.5.6
+- CocoaPods 1.10.0
+- Homebrew 2.5.8
 - NPM 3.10.10
 - Yarn 1.22.5
 - NuGet 4.7.0.5148
 - Miniconda 4.8.3
 - RubyGems 3.1.4
-- Composer 1.10.15
+- Composer 2.0.5
 
 ### Project Management
 - Apache Maven 3.6.3
@@ -50,40 +52,40 @@
 
 ### Utilities
 - Curl 7.73.0
-- Git: 2.28.0
-- Git LFS: 2.12.0
-- GitHub CLI: 1.1.0
+- Git: 2.29.2
+- Git LFS: 2.12.1
+- GitHub CLI: 1.2.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
 - Subversion (SVN) 1.14.0
-- Packer 1.6.4
+- Packer 1.6.5
 - OpenSSL 1.0.2t  10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)`
 - jq 1.6
 - gpg (GnuPG) 2.2.23
 - psql (PostgreSQL) 13.0
 - PostgreSQL 13.0
 - aria2 1.35.0
-- azcopy 10.6.0
+- azcopy 10.7.0
 - zstd 1.4.5
-- bazel 3.6.0
-- bazelisk 1.7.2
-- helm v3.3.4+ga61ce56
+- bazel 3.7.0
+- bazelisk 1.7.4
+- helm v3.4.0+g7090a89
 - mongo v4.4.1
 - mongod v4.4.1
 - 7-Zip 16.02
-- virtualbox 6.1.14r140239
+- virtualbox 6.1.16r140961
 - Vagrant 2.2.10
-- GNU parallel 20200722
+- GNU parallel 20201022
 
 
 ### Tools
-- Fastlane 2.163.0
+- Fastlane 2.166.0
 - Cmake 3.18.4
 - App Center CLI 1.2.2
-- Azure CLI 2.13.0
-- AWS CLI 2.0.57
-- AWS SAM CLI 1.6.2
-- AWS Session Manager CLI 1.1.61.0
+- Azure CLI 2.14.1
+- AWS CLI 2.0.62
+- AWS SAM CLI 1.8.0
+- AWS Session Manager CLI 1.2.7.0
 - Aliyun CLI 3.0.60
 - GHCup v0.1.11
 - GHC 8.10.2
@@ -95,21 +97,21 @@
 - SwiftLint 0.40.3
 
 ### Browsers
-- Safari 14.0 (14610.1.28.1.9)
-- SafariDriver 14.0 (14610.1.28.1.9)
-- Google Chrome 86.0.4240.80 
+- Safari 14.0 (14610.1.28.1.10)
+- SafariDriver 14.0 (14610.1.28.1.10)
+- Google Chrome 86.0.4240.183 
 - ChromeDriver 86.0.4240.22
-- Microsoft Edge 85.0.564.70 
-- MSEdgeDriver 85.0.564.70
-- Mozilla Firefox 81.0.2
+- Microsoft Edge 86.0.622.63 
+- MSEdgeDriver 86.0.622.63
+- Mozilla Firefox 82.0.2
 - geckodriver 0.27.0
 
 ### Java
 | Version   | Vendor       | Environment Variable |
 | --------- | ------------ | -------------------- |
-| 1.7.0_272 | Zulu         | JAVA_HOME_7_X64      |
-| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64      |
-| 11.0.8    | AdoptOpenJDK | JAVA_HOME_11_X64     |
+| 1.7.0_282 | Zulu         | JAVA_HOME_7_X64      |
+| 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64      |
+| 11.0.9    | AdoptOpenJDK | JAVA_HOME_11_X64     |
 | 12.0.2    | AdoptOpenJDK | JAVA_HOME_12_X64     |
 | 13.0.2    | AdoptOpenJDK | JAVA_HOME_13_X64     |
 | 14.0.2    | AdoptOpenJDK | JAVA_HOME_14_X64     |
@@ -118,7 +120,7 @@
 - 2.4.10
 - 2.5.8
 - 2.6.6
-- 2.7.1
+- 2.7.2
 
 #### Python
 - 2.7.18
@@ -134,16 +136,16 @@
 
 #### Node.js
 - 8.17.0
-- 10.22.1
+- 10.23.0
 - 12.19.0
-- 14.14.0
+- 14.15.0
 
 #### Go
 - 1.11.13
 - 1.12.17
 - 1.13.15
-- 1.14.10
-- 1.15.3
+- 1.14.11
+- 1.15.4
 
 ### Rust Tools
 - Rust 1.47.0
@@ -152,8 +154,8 @@
 #### Packages
 - Bindgen 0.55.1
 - Cbindgen 0.15.0
-- Cargo-outdated v0.9.11
-- Cargo-audit 0.12.1
+- Cargo-outdated v0.9.13
+- Cargo-audit 0.13.1
 
 ### PowerShell Tools
 - PowerShell 7.0.3
@@ -267,7 +269,7 @@
 
 #### Xcode Support Tools
 - xcpretty 0.3.0
-- xcversion 2.6.6
+- xcversion 2.6.7
 - Nomad CLI 3.1.4
 - Nomad CLI IPA ipa 0.14.3
 - xctool 0.3.7
@@ -367,7 +369,7 @@
 | Android SDK Tools          | 26.1.1                                                                                                                                                                                                                                                                                                                                                                                        |
 | Android SDK Platforms      | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4)<br>android-18 (rev 3)<br>android-17 (rev 3)<br>android-16 (rev 5)<br>android-15 (rev 5)                                  |
 | Android SDK Build-tools    | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 23.0.0<br>22.0.1 22.0.0<br>21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1<br>20.0.0<br>19.1.0 19.0.0 19.0.1 19.0.2 19.0.3<br>18.0.1 18.1.0 18.1.1<br>17.0.0 |
-| Android SDK Platform-Tools | 30.0.4                                                                                                                                                                                                                                                                                                                                                                                        |
+| Android SDK Platform-Tools | 30.0.5                                                                                                                                                                                                                                                                                                                                                                                        |
 | Google APIs                | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24                                                                                                                                                                                                                                                                      |
 | Android Support Repository | 47.0.0                                                                                                                                                                                                                                                                                                                                                                                        |
 | Google Play services       | 49                                                                                                                                                                                                                                                                                                                                                                                            |

From 1edf18bc3fc85be916dcc3325fb1dd7a030956a1 Mon Sep 17 00:00:00 2001
From: Darii Nurgaleev <Darleev@github.com>
Date: Wed, 11 Nov 2020 13:11:31 +0700
Subject: [PATCH 41/44] added workaround for gcc

---
 images/macos/provision/core/gcc.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/images/macos/provision/core/gcc.sh b/images/macos/provision/core/gcc.sh
index fefe20fd..f59d32f5 100644
--- a/images/macos/provision/core/gcc.sh
+++ b/images/macos/provision/core/gcc.sh
@@ -4,4 +4,14 @@ echo "Installing GCC@8 using homebrew..."
 brew install gcc@8
 
 echo "Installing GCC@9 using homebrew..."
-brew install gcc@9
\ No newline at end of file
+brew install gcc@9
+
+echo "Applying workaround for the GCC"
+cellarPath=$(brew --cellar gcc@8)
+gccVersion=$(ls $cellarPath | head -n1)
+fullCellarPath=$cellarPath/$gccVersion
+ln -s $fullCellarPath/bin/c++-8 /usr/local/bin/c++-8
+ln -s $fullCellarPath/bin/cpp-8 /usr/local/bin/cpp-8
+ln -s $fullCellarPath/bin/g++-8 /usr/local/bin/g++-8
+ln -s $fullCellarPath/bin/gcc-8 /usr/local/bin/gcc-8
+ln -s $fullCellarPath/bin/gfortran-8 /usr/local/bin/gfortran-8
\ No newline at end of file

From 1c9a9c1c9e1c64778190ab97a6dee0ebdc8617f5 Mon Sep 17 00:00:00 2001
From: Darii Nurgaleev <Darleev@github.com>
Date: Wed, 11 Nov 2020 13:20:18 +0700
Subject: [PATCH 42/44] added brew issue link

---
 images/macos/provision/core/gcc.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/macos/provision/core/gcc.sh b/images/macos/provision/core/gcc.sh
index f59d32f5..1bac167e 100644
--- a/images/macos/provision/core/gcc.sh
+++ b/images/macos/provision/core/gcc.sh
@@ -6,6 +6,8 @@ brew install gcc@8
 echo "Installing GCC@9 using homebrew..."
 brew install gcc@9
 
+# Known issue with brew that prevent installation of multiple formulas
+# https://github.com/Homebrew/brew/issues/9100
 echo "Applying workaround for the GCC"
 cellarPath=$(brew --cellar gcc@8)
 gccVersion=$(ls $cellarPath | head -n1)

From 85c66c52c9175b68f338d01cefcdfe091febc400 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 Nov 2020 07:38:21 +0000
Subject: [PATCH 43/44] Updating readme file for macOS-10.15 version 20201107.1
 (#2015)

Co-authored-by: Image generation service account <no-reply@microsoft.com>
Co-authored-by: Actions service account <no-reply@github.com>
---
 images/macos/macos-10.15-Readme.md | 234 ++++++++++++++---------------
 1 file changed, 110 insertions(+), 124 deletions(-)

diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md
index cfb4e810..09373e12 100644
--- a/images/macos/macos-10.15-Readme.md
+++ b/images/macos/macos-10.15-Readme.md
@@ -1,15 +1,15 @@
 | Announcements |
 |-|
-| [.NET 5.0 will become a default .NET version on November, 10](https://github.com/actions/virtual-environments/issues/1891) |
+| [Default Node.JS will be switched to 14.x on all platforms ](https://github.com/actions/virtual-environments/issues/1953) |
+| [[macOS] Default Python will be upgraded to 3.9](https://github.com/actions/virtual-environments/issues/1929) |
+| [.NET 5.0 will become a default .NET version the week of November 16, 2020](https://github.com/actions/virtual-environments/issues/1891) |
 | [macOS 11.0 (Big Sur) is available as a preview 🚀](https://github.com/actions/virtual-environments/issues/1814) |
-| [[macOS] Default Ruby version will be changed to 2.7 on October, 26](https://github.com/actions/virtual-environments/issues/1775) |
-| [Default Xcode will be changed to Xcode 12.0.1 on October, 20](https://github.com/actions/virtual-environments/issues/1712) |
 | [Xcode 11.0, 11.1, 11.4.0 will be deprecated on November, 5](https://github.com/actions/virtual-environments/issues/1688) |
 ***
 # macOS 10.15 info
-- System Version: macOS 10.15.7 (19H2)
+- System Version: macOS 10.15.7 (19H15)
 - Kernel Version: Darwin 19.6.0
-- Image Version: 20201026.2
+- Image Version: 20201107.1
 
 ## Installed Software
 ### Language and Runtime
@@ -19,31 +19,32 @@
 - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0  - available by `gfortran-8` alias
 - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0  - available by `gfortran-9` alias
 - R 4.0.3
-- Node.js v12.19.0
-- NVM 0.36.0
-- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.19.0 v13.14.0 v14.14.0
+- Node.js v14.15.0
+- NVM 0.37.0
+- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.0 v12.19.0 v13.14.0 v14.15.0
 - Python 2.7.17
 - Python 3.8.6
 - Ruby 2.7.2p137
 - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.602 2.1.603 2.1.604 2.1.607 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 2.1.811 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403
 - Go 1.15.3
-- PHP 7.4.11
+- PHP 7.4.12
 - julia 1.5.2
 
 ### Package Management
 - Vcpkg 2020.06.15
 - Pip 19.3.1 (python 2.7)
-- Pip 20.2.3 (python 3.8)
+- Pip 20.2.4 (python 3.8)
+- Pipx 0.15.6.0
 - Bundler version 2.1.4
 - Carthage 0.36.0
 - CocoaPods 1.10.0
-- Homebrew 2.5.7
+- Homebrew 2.5.8
 - NPM 6.14.8
 - Yarn 1.22.5
 - NuGet 5.6.0.6489
 - Miniconda 4.8.3
 - RubyGems 3.1.4
-- Composer 2.0.2
+- Composer 2.0.6
 
 ### Project Management
 - Apache Maven 3.6.3
@@ -52,40 +53,40 @@
 
 ### Utilities
 - Curl 7.73.0
-- Git: 2.29.1
-- Git LFS: 2.12.0
-- GitHub CLI: 1.1.0
+- Git: 2.29.2
+- Git LFS: 2.12.1
+- GitHub CLI: 1.2.0
 - Hub CLI: 2.14.2
 - GNU Wget 1.20.3
 - Subversion (SVN) 1.14.0
-- Packer 1.6.4
+- Packer 1.6.5
 - OpenSSL 1.0.2t  10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)`
 - jq 1.6
 - gpg (GnuPG) 2.2.23
 - psql (PostgreSQL) 13.0
 - PostgreSQL 13.0
 - aria2 1.35.0
-- azcopy 10.6.1
+- azcopy 10.7.0
 - zstd 1.4.5
 - bazel 3.7.0
 - bazelisk 1.7.4
-- helm v3.3.4+ga61ce56
+- helm v3.4.0+g7090a89
 - mongo v4.4.1
 - mongod v4.4.1
 - 7-Zip 16.02
-- Newman 5.2.0
+- Newman 5.2.1
 - virtualbox 6.1.16r140961
 - Vagrant 2.2.10
 - GNU parallel 20201022
 
 
 ### Tools
-- Fastlane 2.165.0
+- Fastlane 2.166.0
 - Cmake 3.18.4
-- App Center CLI 2.7.2
-- Azure CLI 2.13.0
-- AWS CLI 2.0.59
-- AWS SAM CLI 1.6.2
+- App Center CLI 2.7.3
+- Azure CLI 2.14.1
+- AWS CLI 2.0.62
+- AWS SAM CLI 1.8.0
 - AWS Session Manager CLI 1.2.7.0
 - Aliyun CLI 3.0.60
 - GHCup v0.1.11
@@ -100,17 +101,17 @@
 ### Browsers
 - Safari 14.0 (15610.1.28.1.9)
 - SafariDriver 14.0 (15610.1.28.1.9)
-- Google Chrome 86.0.4240.111 
+- Google Chrome 86.0.4240.183 
 - ChromeDriver 86.0.4240.22
-- Microsoft Edge 86.0.622.51 
-- MSEdgeDriver 86.0.622.51
-- Mozilla Firefox 82.0
+- Microsoft Edge 86.0.622.63 
+- MSEdgeDriver 86.0.622.63
+- Mozilla Firefox 82.0.2
 - geckodriver 0.27.0
 
 ### Java
 | Version   | Vendor       | Environment Variable |
 | --------- | ------------ | -------------------- |
-| 1.7.0_272 | Zulu         | JAVA_HOME_7_X64      |
+| 1.7.0_282 | Zulu         | JAVA_HOME_7_X64      |
 | 1.8.0_272 | AdoptOpenJDK | JAVA_HOME_8_X64      |
 | 11.0.9    | AdoptOpenJDK | JAVA_HOME_11_X64     |
 | 12.0.2    | AdoptOpenJDK | JAVA_HOME_12_X64     |
@@ -137,16 +138,14 @@
 
 #### Node.js
 - 8.17.0
-- 10.22.1
+- 10.23.0
 - 12.19.0
-- 14.14.0
+- 14.15.0
 
 #### Go
-- 1.11.13
-- 1.12.17
 - 1.13.15
-- 1.14.10
-- 1.15.3
+- 1.14.11
+- 1.15.4
 
 ### Rust Tools
 - Rust 1.47.0
@@ -155,8 +154,8 @@
 #### Packages
 - Bindgen 0.55.1
 - Cbindgen 0.15.0
-- Cargo-outdated v0.9.11
-- Cargo-audit 0.12.1
+- Cargo-outdated v0.9.13
+- Cargo-audit 0.13.1
 
 ### PowerShell Tools
 - PowerShell 7.0.3
@@ -170,7 +169,7 @@
 
 ### Xamarin
 #### Visual Studio for Mac
-- 8.7.8.4
+- 8.7.9.9
 
 #### Mono
 - 6.12.0.93
@@ -180,6 +179,7 @@
 - 6.4.0.208
 
 #### Xamarin.iOS
+- 14.2.0.12
 - 14.0.0.0
 - 13.20.2.2
 - 13.18.2.1
@@ -215,110 +215,96 @@
 ### Xcode
 | Version          | Build    | Path                           |
 | ---------------- | -------- | ------------------------------ |
-| 12.2 (beta)      | 12B5035g | /Applications/Xcode_12.2.app   |
+| 12.2 (beta)      | 12B5044c | /Applications/Xcode_12.2.app   |
+| 12.1.1           | 12A7605b | /Applications/Xcode_12.1.1.app |
 | 12.1             | 12A7403  | /Applications/Xcode_12.1.app   |
 | 12.0.1 (default) | 12A7300  | /Applications/Xcode_12.app     |
 | 11.7             | 11E801a  | /Applications/Xcode_11.7.app   |
 | 11.6             | 11E708   | /Applications/Xcode_11.6.app   |
 | 11.5             | 11E608c  | /Applications/Xcode_11.5.app   |
 | 11.4.1           | 11E503a  | /Applications/Xcode_11.4.1.app |
-| 11.4             | 11E146   | /Applications/Xcode_11.4.app   |
 | 11.3.1           | 11C505   | /Applications/Xcode_11.3.1.app |
 | 11.2.1           | 11B500   | /Applications/Xcode_11.2.1.app |
-| 11.1             | 11A1027  | /Applications/Xcode_11.1.app   |
-| 11.0             | 11A420a  | /Applications/Xcode_11.app     |
 | 10.3             | 10G8     | /Applications/Xcode_10.3.app   |
 
 #### Xcode Support Tools
 - xcpretty 0.3.0
-- xcversion 2.6.6
+- xcversion 2.6.7
 - Nomad CLI 3.1.4
 - Nomad CLI IPA ipa 0.14.3
 - xctool 0.3.7
 
 #### Installed SDKs
-| SDK                     | SDK Name             | Xcode Version                                                            |
-| ----------------------- | -------------------- | ------------------------------------------------------------------------ |
-| macOS 10.14             | macosx10.14          | 10.3                                                                     |
-| macOS 10.15             | macosx10.15          | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1 |
-| macOS 11.0              | macosx11.0           | 12.2                                                                     |
-| iOS 12.4                | iphoneos12.4         | 10.3                                                                     |
-| iOS 13.0                | iphoneos13.0         | 11.0                                                                     |
-| iOS 13.1                | iphoneos13.1         | 11.1                                                                     |
-| iOS 13.2                | iphoneos13.2         | 11.2.1, 11.3.1                                                           |
-| iOS 13.4                | iphoneos13.4         | 11.4, 11.4.1                                                             |
-| iOS 13.5                | iphoneos13.5         | 11.5                                                                     |
-| iOS 13.6                | iphoneos13.6         | 11.6                                                                     |
-| iOS 13.7                | iphoneos13.7         | 11.7                                                                     |
-| iOS 14.0                | iphoneos14.0         | 12.0.1                                                                   |
-| iOS 14.1                | iphoneos14.1         | 12.1                                                                     |
-| iOS 14.2                | iphoneos14.2         | 12.2                                                                     |
-| Simulator - iOS 12.4    | iphonesimulator12.4  | 10.3                                                                     |
-| Simulator - iOS 13.0    | iphonesimulator13.0  | 11.0                                                                     |
-| Simulator - iOS 13.1    | iphonesimulator13.1  | 11.1                                                                     |
-| Simulator - iOS 13.2    | iphonesimulator13.2  | 11.2.1, 11.3.1                                                           |
-| Simulator - iOS 13.4    | iphonesimulator13.4  | 11.4, 11.4.1                                                             |
-| Simulator - iOS 13.5    | iphonesimulator13.5  | 11.5                                                                     |
-| Simulator - iOS 13.6    | iphonesimulator13.6  | 11.6                                                                     |
-| Simulator - iOS 13.7    | iphonesimulator13.7  | 11.7                                                                     |
-| Simulator - iOS 14.0    | iphonesimulator14.0  | 12.0.1                                                                   |
-| Simulator - iOS 14.1    | iphonesimulator14.1  | 12.1                                                                     |
-| Simulator - iOS 14.2    | iphonesimulator14.2  | 12.2                                                                     |
-| tvOS 12.4               | appletvos12.4        | 10.3                                                                     |
-| tvOS 13.0               | appletvos13.0        | 11.0, 11.1                                                               |
-| tvOS 13.2               | appletvos13.2        | 11.2.1, 11.3.1                                                           |
-| tvOS 13.4               | appletvos13.4        | 11.4, 11.4.1, 11.5, 11.6, 11.7                                           |
-| tvOS 14.0               | appletvos14.0        | 12.0.1, 12.1                                                             |
-| tvOS 14.2               | appletvos14.2        | 12.2                                                                     |
-| Simulator - tvOS 12.4   | appletvsimulator12.4 | 10.3                                                                     |
-| Simulator - tvOS 13.0   | appletvsimulator13.0 | 11.0, 11.1                                                               |
-| Simulator - tvOS 13.2   | appletvsimulator13.2 | 11.2.1, 11.3.1                                                           |
-| Simulator - tvOS 13.4   | appletvsimulator13.4 | 11.4, 11.4.1, 11.5, 11.6, 11.7                                           |
-| Simulator - tvOS 14.0   | appletvsimulator14.0 | 12.0.1, 12.1                                                             |
-| Simulator - tvOS 14.2   | appletvsimulator14.2 | 12.2                                                                     |
-| watchOS 5.3             | watchos5.3           | 10.3                                                                     |
-| watchOS 6.0             | watchos6.0           | 11.0, 11.1                                                               |
-| watchOS 6.1             | watchos6.1           | 11.2.1, 11.3.1                                                           |
-| watchOS 6.2             | watchos6.2           | 11.4, 11.4.1, 11.5, 11.6, 11.7                                           |
-| watchOS 7.0             | watchos7.0           | 12.0.1, 12.1                                                             |
-| watchOS 7.1             | watchos7.1           | 12.2                                                                     |
-| Simulator - watchOS 5.3 | watchsimulator5.3    | 10.3                                                                     |
-| Simulator - watchOS 6.0 | watchsimulator6.0    | 11.0, 11.1                                                               |
-| Simulator - watchOS 6.1 | watchsimulator6.1    | 11.2.1, 11.3.1                                                           |
-| Simulator - watchOS 6.2 | watchsimulator6.2    | 11.4, 11.4.1, 11.5, 11.6, 11.7                                           |
-| Simulator - watchOS 7.0 | watchsimulator7.0    | 12.0.1, 12.1                                                             |
-| Simulator - watchOS 7.1 | watchsimulator7.1    | 12.2                                                                     |
-| DriverKit 19.0          | driverkit.macosx19.0 | 11.0, 11.1, 11.2.1, 11.3.1, 11.4, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1 |
-| DriverKit 20.0          | driverkit.macosx20.0 | 12.2                                                                     |
+| SDK                     | SDK Name             | Xcode Version                                                  |
+| ----------------------- | -------------------- | -------------------------------------------------------------- |
+| macOS 10.14             | macosx10.14          | 10.3                                                           |
+| macOS 10.15             | macosx10.15          | 11.2.1, 11.3.1, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1, 12.1.1 |
+| macOS 11.0              | macosx11.0           | 12.2                                                           |
+| iOS 12.4                | iphoneos12.4         | 10.3                                                           |
+| iOS 13.2                | iphoneos13.2         | 11.2.1, 11.3.1                                                 |
+| iOS 13.4                | iphoneos13.4         | 11.4.1                                                         |
+| iOS 13.5                | iphoneos13.5         | 11.5                                                           |
+| iOS 13.6                | iphoneos13.6         | 11.6                                                           |
+| iOS 13.7                | iphoneos13.7         | 11.7                                                           |
+| iOS 14.0                | iphoneos14.0         | 12.0.1                                                         |
+| iOS 14.1                | iphoneos14.1         | 12.1                                                           |
+| iOS 14.2                | iphoneos14.2         | 12.1.1, 12.2                                                   |
+| Simulator - iOS 12.4    | iphonesimulator12.4  | 10.3                                                           |
+| Simulator - iOS 13.2    | iphonesimulator13.2  | 11.2.1, 11.3.1                                                 |
+| Simulator - iOS 13.4    | iphonesimulator13.4  | 11.4.1                                                         |
+| Simulator - iOS 13.5    | iphonesimulator13.5  | 11.5                                                           |
+| Simulator - iOS 13.6    | iphonesimulator13.6  | 11.6                                                           |
+| Simulator - iOS 13.7    | iphonesimulator13.7  | 11.7                                                           |
+| Simulator - iOS 14.0    | iphonesimulator14.0  | 12.0.1                                                         |
+| Simulator - iOS 14.1    | iphonesimulator14.1  | 12.1                                                           |
+| Simulator - iOS 14.2    | iphonesimulator14.2  | 12.1.1, 12.2                                                   |
+| tvOS 12.4               | appletvos12.4        | 10.3                                                           |
+| tvOS 13.2               | appletvos13.2        | 11.2.1, 11.3.1                                                 |
+| tvOS 13.4               | appletvos13.4        | 11.4.1, 11.5, 11.6, 11.7                                       |
+| tvOS 14.0               | appletvos14.0        | 12.0.1, 12.1                                                   |
+| tvOS 14.2               | appletvos14.2        | 12.1.1, 12.2                                                   |
+| Simulator - tvOS 12.4   | appletvsimulator12.4 | 10.3                                                           |
+| Simulator - tvOS 13.2   | appletvsimulator13.2 | 11.2.1, 11.3.1                                                 |
+| Simulator - tvOS 13.4   | appletvsimulator13.4 | 11.4.1, 11.5, 11.6, 11.7                                       |
+| Simulator - tvOS 14.0   | appletvsimulator14.0 | 12.0.1, 12.1                                                   |
+| Simulator - tvOS 14.2   | appletvsimulator14.2 | 12.1.1, 12.2                                                   |
+| watchOS 5.3             | watchos5.3           | 10.3                                                           |
+| watchOS 6.1             | watchos6.1           | 11.2.1, 11.3.1                                                 |
+| watchOS 6.2             | watchos6.2           | 11.4.1, 11.5, 11.6, 11.7                                       |
+| watchOS 7.0             | watchos7.0           | 12.0.1, 12.1                                                   |
+| watchOS 7.1             | watchos7.1           | 12.1.1, 12.2                                                   |
+| Simulator - watchOS 5.3 | watchsimulator5.3    | 10.3                                                           |
+| Simulator - watchOS 6.1 | watchsimulator6.1    | 11.2.1, 11.3.1                                                 |
+| Simulator - watchOS 6.2 | watchsimulator6.2    | 11.4.1, 11.5, 11.6, 11.7                                       |
+| Simulator - watchOS 7.0 | watchsimulator7.0    | 12.0.1, 12.1                                                   |
+| Simulator - watchOS 7.1 | watchsimulator7.1    | 12.1.1, 12.2                                                   |
+| DriverKit 19.0          | driverkit.macosx19.0 | 11.2.1, 11.3.1, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1, 12.1.1 |
+| DriverKit 20.0          | driverkit.macosx20.0 | 12.2                                                           |
 
 #### Installed Simulators
-| OS          | Xcode Version                          | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| ----------- | -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| iOS 12.4    | 10.3                                   | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone Xs<br>iPhone Xs Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air (3rd generation)<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (11-inch) (1st generation)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) |
-| iOS 13.0    | 11.0                                   | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (11-inch) (1st generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                                             |
-| iOS 13.1    | 11.1                                   | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (11-inch) (1st generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                                             |
-| iOS 13.2    | 11.2.1                                 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (11-inch) (1st generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                    |
-| iOS 13.3    | 11.3.1                                 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (11-inch) (1st generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                    |
-| iOS 13.4    | 11.4<br>11.4.1                         | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                            |
-| iOS 13.5    | 11.5                                   | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                            |
-| iOS 13.6    | 11.6                                   | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                            |
-| iOS 13.7    | 11.7                                   | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                            |
-| iOS 14.0    | 12.0.1                                 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                       |
-| iOS 14.1    | 12.1                                   | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                  |
-| iOS 14.2    | 12.2                                   | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                  |
-| tvOS 12.4   | 10.3                                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 13.0   | 11.0<br>11.1                           | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 13.2   | 11.2.1                                 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 13.3   | 11.3.1                                 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 13.4   | 11.4<br>11.4.1<br>11.5<br>11.6<br>11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 14.0   | 12.0.1<br>12.1                         | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| tvOS 14.2   | 12.2                                   | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| watchOS 5.3 | 10.3                                   | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm                                                                                                                                                                                                                                                                                                                                             |
-| watchOS 6.0 | 11.0<br>11.1                           | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                                                                                                                                                                                                                                                                                           |
-| watchOS 6.1 | 11.2.1<br>11.3.1                       | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                                                                                                                                                                                                                                                                                           |
-| watchOS 6.2 | 11.4<br>11.4.1<br>11.5<br>11.6<br>11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                                                                                                                                                                                                                                                                                           |
-| watchOS 7.0 | 12.0.1<br>12.1                         | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm                                                                                                                                                                                                                                                                                                                                             |
-| watchOS 7.1 | 12.2                                   | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm                                                                                                                                                                                                                                                                                                                                             |
+| OS          | Xcode Version                  | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| ----------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 12.4    | 10.3                           | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone Xs<br>iPhone Xs Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air (3rd generation)<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) |
+| iOS 13.2    | 11.2.1                         | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                    |
+| iOS 13.3    | 11.3.1                         | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                                                                    |
+| iOS 13.4    | 11.4.1                         | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                     |
+| iOS 13.5    | 11.5                           | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                     |
+| iOS 13.6    | 11.6                           | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                     |
+| iOS 13.7    | 11.7                           | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                                                                                                     |
+| iOS 14.0    | 12.0.1                         | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                                                                                                |
+| iOS 14.1    | 12.1                           | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                           |
+| iOS 14.2    | 12.1.1<br>12.2                 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch)                                                           |
+| tvOS 12.4   | 10.3                           | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tvOS 13.2   | 11.2.1                         | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tvOS 13.3   | 11.3.1                         | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tvOS 13.4   | 11.4.1<br>11.5<br>11.6<br>11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tvOS 14.0   | 12.0.1<br>12.1                 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tvOS 14.2   | 12.1.1<br>12.2                 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p)                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| watchOS 5.3 | 10.3                           | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm                                                                                                                                                                                                                                                                                                      |
+| watchOS 6.1 | 11.2.1<br>11.3.1               | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                                                                                                                                                                                                                                                    |
+| watchOS 6.2 | 11.4.1<br>11.5<br>11.6<br>11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm                                                                                                                                                                                                                                                                                                                                                                    |
+| watchOS 7.0 | 12.0.1<br>12.1                 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm                                                                                                                                                                                                                                                                                                      |
+| watchOS 7.1 | 12.1.1<br>12.2                 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm                                                                                                                                                                                                                                                                                                      |
 
 ### Android
 | Package Name               | Version                                                                                                                                                                                                        |
@@ -326,7 +312,7 @@
 | Android SDK Tools          | 26.1.1                                                                                                                                                                                                         |
 | Android SDK Platforms      | android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)                                                         |
 | Android SDK Build-tools    | 30.0.0 30.0.1 30.0.2<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 |
-| Android SDK Platform-Tools | 30.0.4                                                                                                                                                                                                         |
+| Android SDK Platform-Tools | 30.0.5                                                                                                                                                                                                         |
 | Google APIs                | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24                                                                                       |
 | Android Support Repository | 47.0.0                                                                                                                                                                                                         |
 | Google Play services       | 49                                                                                                                                                                                                             |

From ec9befb26ab355df45f509fee8106dcbe56511c5 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <v-sedoli@microsoft.com>
Date: Wed, 11 Nov 2020 16:01:41 +0500
Subject: [PATCH 44/44] Workaround for apt db locked by WALinuxAgent v2 (#2000)

* retry apt if lock is held by other process

* Increase timeout and change grep string
---
 images/linux/scripts/base/apt-mock.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/base/apt-mock.sh b/images/linux/scripts/base/apt-mock.sh
index 986068b0..3188c644 100644
--- a/images/linux/scripts/base/apt-mock.sh
+++ b/images/linux/scripts/base/apt-mock.sh
@@ -11,17 +11,22 @@ for tool in apt apt-get apt-fast;do
 
 i=1
 while [ \$i -le 30 ];do
-  fuser /var/lib/dpkg/lock >/dev/null 2>&1
+  err=\$(mktemp)
+  $real_tool "\$@" 2>\$err
   result=\$?
   if [ \$result -eq  0 ];then
-    sleep 1
-    echo "/var/lib/dpkg/locked... retry \$i"
-    i=\$((i + 1))
-  else
     break
   fi
+  grep -q 'Could not get lock' \$err
+  held=\$?
+  if [ \$held -ne  0 ];then
+    break
+  fi
+  cat \$err >&2
+  sleep 5
+  echo "...retry \$i"
+  i=\$((i + 1))
 done
-$real_tool "\$@"
 EOT
   chmod +x $prefix/$tool
 done