Merge pull request #3007 from Azure/main

Merge main into stable for release 2.23.0

Author: gingi

.vsts/common/build-vars.ps1

@@ -4,7 +4,7 @@ steps:
       versionSpec: '18.x.x'
     displayName: Set NodeJS version
 
-  - script: cp .vsts/pipelines.npmrc $(Agent.TempDirectory)/.npmrc
+  - script: cp .vsts/common/pipelines.npmrc $(Agent.TempDirectory)/.npmrc
     displayName: Stage .npmrc file
 
   - task: npmAuthenticate@0
@@ -13,7 +13,7 @@ steps:
       workingFile: $(Agent.TempDirectory)/.npmrc
 
   # Using the 'script' task as-written below doesn't work properly on Windows.
-  # It seem to be adding an extra quote character somehow. Using a separate
+  # It seems to be adding an extra quote character somehow. Using a separate
   # powershell task for Windows gets around this issue.
   - script: |
       echo "##vso[task.setvariable variable=npm_config_userconfig]$(Agent.TempDirectory)/.npmrc"

.vsts/node-setup.yml .vsts/common/dependencies.yml.vsts/node-setup.yml renamed to .vsts/common/dependencies.yml

@@ -1,5 +1,5 @@
 steps:
-  - template: ../dependencies.yml
+  - template: ../common/dependencies.yml
   - script: |
       set -e
       echo "Node.js version $(node --version)"