From b07aceb7a4ce2c4e0caf38cbf03bd3f662308c61 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 31 May 2022 01:24:33 +0200 Subject: [PATCH] [Windows] Install parcel after python3 (#5629) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/windows2016.json | 4 ++-- images/win/windows2019.json | 2 +- images/win/windows2022.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f0677d55..1325b6c2 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -377,7 +377,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel@2.5.0", "test": "parcel --version" }, + { "name": "parcel", "test": "parcel --version" }, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 88273c5d..38c8d87a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -413,7 +413,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel@2.5.0", "test": "parcel --version"}, + { "name": "parcel", "test": "parcel --version"}, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index f9b5d363..901d164d 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -183,8 +183,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", @@ -194,6 +192,8 @@ "{{ 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/Install-NodeLts.ps1", + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 306ea7db..f2a50f97 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -178,7 +178,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" @@ -208,6 +207,7 @@ "{{ 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/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 216eeb19..a427e239 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -177,7 +177,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" @@ -207,6 +206,7 @@ "{{ 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/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",