Merge branch 'master' into prepare-2.13.0

Author: gingi

.gitignore

@@ -3,6 +3,7 @@ build/
 dll/
 typings/
 logs/
+env/
 *.log*
 *.mem.csv
 release/

.vscode/extensions.json

@@ -2,7 +2,6 @@
   "recommendations": [
     "stylelint.vscode-stylelint",
     "EditorConfig.EditorConfig",
-    "msjsdiag.debugger-for-chrome",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
     "rvest.vs-code-prettier-eslint",

.vsts/common/generate-sbom.yml

@@ -0,0 +1,6 @@
+steps:
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: "SBOM Generation"
+    inputs:
+      BuildDropPath: ./release
+

.vsts/darwin/darwin-dependencies.yml

@@ -1,11 +1,7 @@
 steps:
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      python --version
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm ci

.vsts/darwin/distribution.yml

@@ -28,6 +28,7 @@ steps:
     displayName: Build dmg
   - script: npm run package darwin-manifest
     displayName: Create manifest
+  - template: ../common/generate-sbom.yml
   - template: ../common/publish-artifacts.yml
     parameters:
       folder: darwin

.vsts/darwin/sign.yml

@@ -1,4 +1,10 @@
 steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
+
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     inputs:
       ConnectedServiceName: 'ESRP CodeSign'

.vsts/dependencies.yml

@@ -2,6 +2,5 @@ steps:
   - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build type
 
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.x.x'
+  - template: ./node-setup.yml
+  - template: ./python-setup.yml

.vsts/distribution.yml

@@ -2,19 +2,26 @@
 jobs:
   - job: Linux
     pool:
-      vmImage: ubuntu-18.04
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+      - ImageOverride -equals BatchExplorerBuildImage-Linux
     steps:
        - template: ./linux/distribution.yml
 
   - job: MacOS
     pool:
       vmImage: macOS-10.15
       demands: xcode
+    variables:
+      - name: EOCompliance-Mac
+        value: true
     steps:
        - template: ./darwin/distribution.yml
 
   - job: Windows
     pool:
-      vmImage: vs2017-win2016
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+      - ImageOverride -equals BatchExplorerBuildImage-Windows
     steps:
       - template: ./win/distribution.yml

.vsts/linux/distribution.yml

@@ -10,6 +10,7 @@ steps:
       . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run package linux-manifest
     displayName: Create manifest
+  - template: ../common/generate-sbom.yml
   - template: ../common/publish-artifacts.yml
     parameters:
       folder: linux

.vsts/linux/linux-dependencies.yml

@@ -8,12 +8,8 @@ steps:
       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0 rpm
     displayName: Install Linux packages
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      echo "Python version $(python --version)"
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm install -g codecov