From c66d9d4e72bd7c2b9c7c600ddecb1aa6bfe0c3b3 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Mon, 2 Nov 2020 14:22:07 +0300
Subject: [PATCH 1/2] use toolset to install az module

---
 images/linux/scripts/installers/azpowershell.sh | 8 ++------
 images/linux/toolsets/toolset-2004.json         | 8 ++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index 47ac5ff3..13253b5f 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -8,12 +8,8 @@
 source $HELPER_SCRIPTS/os.sh
 
 # List of versions
-if isUbuntu20 ; then
-    versions=$(pwsh -Command '(Find-Module -Name Az).Version')
-else
-    toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
-    versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
-fi
+toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
+versions=$(jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]' $toolset)
 
 # Try to install and update PowerShellGet before the actual installation
 pwsh -Command "Install-Module -Name PowerShellGet -Force"
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index c52fcb40..2985f958 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -69,6 +69,14 @@
         {"name": "MarkdownPS"},
         {"name": "Pester"}
     ],
+    "azureModules": [
+        {
+            "name": "az",
+            "versions": [
+                "4.7.0"
+            ]
+        }
+    ],
     "apt": {
         "common_packages": [
             "dbus",

From 6c3b64004728ed133c019ec41c0e28b8654ff9a2 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Mon, 2 Nov 2020 14:37:48 +0300
Subject: [PATCH 2/2] Az 4.8.0

---
 images/linux/toolsets/toolset-2004.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 2985f958..76f2af42 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -73,7 +73,7 @@
         {
             "name": "az",
             "versions": [
-                "4.7.0"
+                "4.8.0"
             ]
         }
     ],