From b19a33bd3e27dce6430c7d7f266651a4c18dfb0a Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Wed, 21 Oct 2020 08:44:06 +0300
Subject: [PATCH] updated json files

---
 images/win/windows2016.json | 14 +++-----------
 images/win/windows2019.json | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 0000e686..120e7ac9 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -235,7 +235,9 @@
                 "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
-                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
+                "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
             ]
         },
         {
@@ -327,16 +329,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts": [
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index fd32abb8..997b1d43 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -250,7 +250,9 @@
                 "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
             ]
         },
         {
@@ -325,16 +327,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts": [