Merge main into stable for release 2.23.0

.vsts/node-setup.yml → .vsts/common/dependencies.yml

@@ -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/darwin/darwin-dependencies.yml

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

.vsts/linux/linux-dependencies.yml

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

.vsts/win/ci.yml

@@ -6,16 +6,6 @@ steps:
       npm run build:package
     displayName: Build and package
 
-  # Disabling end-to-end tests in CI pipeline
-  # - pwsh: |
-  #     . ../.vsts/win/exec.ps1
-  #     $ErrorActionPreference = "Stop"
-  #     $env:BE_TEST_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
-  #     $env:BE_TEST_AAD_USER_PASSWORD = "$(uiTestingAccountPassword)"
-  #     npm run test-e2e
-  #   workingDirectory: desktop
-  #   displayName: End to end tests
-
   - template: ./security-analysis.yml
 
   - template: ../common/publish-artifacts.yml

.vsts/win/credscan.yml

@@ -3,6 +3,6 @@ steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
     displayName: "Run CredScan"
     inputs:
-      suppressionsFile: .vsts/cred-scan-exclude.json
+      suppressionsFile: .vsts/win/cred-scan-exclude.json
       debugMode: false