From 68fdb181e5dde13a4d1880c6e7798f629a36aeb5 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <shibanov-1997@inbox.ru>
Date: Fri, 8 May 2020 11:14:27 +0000
Subject: [PATCH] Add nodejs toolcache for windows (#840)

* add installation of nodejs

Co-authored-by: Dmitry Shibanov <v-dmshib@microsoft.com>
---
 images/win/scripts/Installers/Validate-Toolset.ps1 |  5 ++++-
 images/win/toolset-2016.json                       | 12 ++++++++++++
 images/win/toolset-2019.json                       | 12 ++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/images/win/scripts/Installers/Validate-Toolset.ps1 b/images/win/scripts/Installers/Validate-Toolset.ps1
index 28963b12..34c613d9 100644
--- a/images/win/scripts/Installers/Validate-Toolset.ps1
+++ b/images/win/scripts/Installers/Validate-Toolset.ps1
@@ -62,7 +62,10 @@ $ErrorActionPreference = "Stop"
 Import-Module -Name ImageHelpers -Force
 
 # Define executables for cached tools
-$toolsExecutables = @{ Python = @("python.exe", "Scripts\pip.exe") }
+$toolsExecutables = @{
+    Python = @("python.exe", "Scripts\pip.exe");
+    node = @("node.exe", "npm")
+}
 
 # Get toolcache content from toolset
 $tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache
diff --git a/images/win/toolset-2016.json b/images/win/toolset-2016.json
index da372c49..c1500a4a 100644
--- a/images/win/toolset-2016.json
+++ b/images/win/toolset-2016.json
@@ -26,6 +26,18 @@
                 "3.7.*",
                 "3.8.*"
             ]
+        },
+        {
+            "name": "node",
+            "url" : "https://raw.githubusercontent.com/actions/node-versions/master/versions-manifest.json",
+            "arch": "x64",
+            "platform" : "win32",
+            "versions": [
+                "8.*",
+                "10.*",
+                "12.*",
+                "14.*"
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/images/win/toolset-2019.json b/images/win/toolset-2019.json
index da372c49..c1500a4a 100644
--- a/images/win/toolset-2019.json
+++ b/images/win/toolset-2019.json
@@ -26,6 +26,18 @@
                 "3.7.*",
                 "3.8.*"
             ]
+        },
+        {
+            "name": "node",
+            "url" : "https://raw.githubusercontent.com/actions/node-versions/master/versions-manifest.json",
+            "arch": "x64",
+            "platform" : "win32",
+            "versions": [
+                "8.*",
+                "10.*",
+                "12.*",
+                "14.*"
+            ]
         }
     ]
 }
\ No newline at end of file