Merge branch 'main' of https://github.com/actions/virtual-environments into v-llaphin/fix-path

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

images/linux/scripts/installers/powershellcore.sh

@@ -9,8 +9,7 @@ source $HELPER_SCRIPTS/os.sh
 
 # Install Powershell
 if isUbuntu20 ; then
-    dotnet tool install --tool-path /opt/microsoft/powershell/7 powershell
-    ln -s /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh
+    snap install powershell --classic --channel=edge/useedge
 fi
 
 if isUbuntu16 || isUbuntu18 ; then