From 4553146bc77d2407e687d63844bb2f153c93b576 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:43:00 +0300 Subject: [PATCH] [macOS] set default nodeJS version to 16 (#4559) --- images/macos/tests/Node.Tests.ps1 | 9 --------- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index 5f9e87341..cb2c44200 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -4,11 +4,6 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion Describe "Node.js" { - BeforeAll { - $os = Get-OSVersion - $expectedNodeVersion = if ($os.IsHigherThanMojave) { "v14.*" } else { "v8.*" } - } - It "Node.js is installed" { "node --version" | Should -ReturnZeroExitCode } @@ -17,10 +12,6 @@ Describe "Node.js" { node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" } - It "Node.js $expectedNodeVersion is default" { - (Get-CommandResult "node --version").Output | Should -BeLike $expectedNodeVersion - } - It "NPM is installed" { "npm --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index cef4348d0..9532170f0 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -331,7 +331,7 @@ "default": "1.15" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f0921898c..a89bc721d 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -283,7 +283,7 @@ "default": "1.15" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a0bd7936c..897456c97 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -184,7 +184,7 @@ "default": "1.17" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14",