Merge pull request #2949 from Azure/main

Merge main into stable for release 2.21.0
Azure · Nov 21, 2024 · 6f0cd18 · 6f0cd18
2 parents a3f074c + 321fdfa
commit 6f0cd18
Show file tree

Hide file tree

Showing 424 changed files with 32,174 additions and 20,262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 /**/lib-cjs
 /**/lib-umd
 /**/build
+/**/test-results
 /desktop/release/
 coverage/
 env/
@@ -18,3 +19,4 @@ Localize/out/
 /packages/*/src/generated/*
 /util/bux/__tests__/loc-source/generated
 /web/src/generated/*
+TempTypeSpecFiles
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,3 +1,12 @@
 {
-  "endOfLine": "auto"
+  "endOfLine": "auto",
+  "trailingComma": "es5",
+  "overrides": [
+    {
+      "files": ["*.jsonc", "tsconfig.json"],
+      "options": {
+        "trailingComma": "none"
+      }
+    }
+  ]
 }
diff --git a/.vsts/common/set-dist-vars.yml b/.vsts/common/set-dist-vars.yml
@@ -1,3 +1,3 @@
 steps:
-  - powershell: $(Build.SourcesDirectory)/.vsts/common/build-vars.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
+  - pwsh: $(Build.SourcesDirectory)/.vsts/common/build-vars.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build info
diff --git a/.vsts/darwin/distribution.yml b/.vsts/darwin/distribution.yml
@@ -21,6 +21,16 @@ steps:
       security default-keychain -s $keychain
       security unlock-keychain -p pwd $keychain
       echo "$(apple-developer-certificate)" | base64 -D > $dir/cert.p12
+
+      # Check if certificate is valid
+      if openssl pkcs12 -in $dir/cert.p12 -nokeys -passin pass:"$(apple-developer-certificate-key)" | \
+          openssl x509 -noout -dates -checkend 0; then
+        echo "Certificate is valid."
+      else
+        echo "##[error] Certificate is expired or invalid."
+        exit 1
+      fi
+
       security import $dir/cert.p12 -k $keychain -P "$(apple-developer-certificate-key)" -T /usr/bin/codesign
       security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $keychain
 

diff --git a/.vsts/darwin/entitlements.plist b/.vsts/darwin/entitlements.plist
@@ -2,11 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
 </dict>
 </plist>
diff --git a/.vsts/darwin/sign.yml b/.vsts/darwin/sign.yml
@@ -1,4 +1,10 @@
 steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET 6'
+    inputs:
+      packageType: sdk
+      version: 6.x
+
   - task: EsrpCodeSigning@2
     inputs:
       ConnectedServiceName: 'ESRP CodeSign'
@@ -8,13 +14,13 @@ steps:
       inlineOperation: |
         [
           {
-            "keyCode": "CP-401337-Apple",
-            "operationCode": "MacAppDeveloperSign",
-            "parameters": {
+            "KeyCode": "CP-401337-Apple",
+            "OperationCode": "MacAppDeveloperSign",
+            "ToolName": "sign",
+            "ToolVersion": "1.0",
+            "Parameters": {
               "Hardening": "--options=runtime"
-            },
-            "toolName": "sign",
-            "toolVersion": "1.0"
+            }
           }
         ]
       SessionTimeout: 120

diff --git a/.vsts/distribution.yml b/.vsts/distribution.yml
@@ -38,7 +38,7 @@ stages:
       - job: MacOS
         timeoutInMinutes: 120 # Needed for Codesign + Notarization + CodeQL
         pool:
-          vmImage: macOS-11
+          vmImage: macOS-latest
           demands: xcode
         variables:
           - group: BatchExplorer-Signing

diff --git a/.vsts/linux/distribution.yml b/.vsts/linux/distribution.yml
@@ -23,11 +23,6 @@ steps:
       packagePath: ./packages/bonito-ui
       packageName: "@azure/bonito-ui"
 
-  - template: ./publish-npm-package.yml
-    parameters:
-      packagePath: ./packages/arm-batch-rest
-      packageName: "@batch/arm-batch-rest"
-
   - template: ./publish-npm-package.yml
     parameters:
       packagePath: ./packages/service

diff --git a/.vsts/node-setup.yml b/.vsts/node-setup.yml
@@ -19,7 +19,7 @@ steps:
       echo "##vso[task.setvariable variable=npm_config_userconfig]$(Agent.TempDirectory)/.npmrc"
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     displayName: Set NPM userconfig (Linux/MacOS)
-  - powershell: |
+  - pwsh: |
       Write-Host "##vso[task.setvariable variable=npm_config_userconfig]$env:AGENT_TEMPDIRECTORY\.npmrc"
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
     displayName: Set NPM userconfig (Windows)
diff --git a/.vsts/pipelines.yml b/.vsts/pipelines.yml
@@ -10,7 +10,7 @@ jobs:
 
   - job: MacOS
     pool:
-      vmImage: macOS-11
+      vmImage: macOS-latest
       demands: xcode
     variables:
       - name: EOCompliance-Mac

diff --git a/.vsts/python-setup.yml b/.vsts/python-setup.yml
@@ -19,7 +19,7 @@ steps:
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     displayName: Install Python dependencies (Linux)
 
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1

diff --git a/.vsts/win/ci.yml b/.vsts/win/ci.yml
@@ -2,19 +2,20 @@ steps:
   - template: ./credscan.yml
   - template: ./win-dependencies.yml
 
-  - powershell: |
+  - pwsh: |
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       npm run build:package
     displayName: Build and package
 
-  - powershell: |
-      . ../.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
+  # 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
 

diff --git a/.vsts/win/distribution.yml b/.vsts/win/distribution.yml
@@ -4,25 +4,25 @@ steps:
   - template: ./win-dependencies.yml
   - template: ../common/download-i18n-artifacts.yml
 
-  - powershell: |
+  - pwsh: |
       $(System.DefaultWorkingDirectory)/Localize/copy-translations.ps1 -artifactsPath "$(Agent.BuildDirectory)/drop/loc"
     displayName: 'Run copy-translations.ps1 with artifacts path (Windows)'
 
-  - powershell: |
+  - pwsh: |
       $version = npm run -s ts scripts/package/get-version
       Write-Host "Updating build number to $version"
       Write-Host "##vso[build.updatebuildnumber]$version"
     workingDirectory: desktop
     displayName: Update build version for packaging
 
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       exec { npm run build:prod }
     displayName: Build all packages
 
-  - powershell: |
+  - pwsh: |
       . ../.vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
@@ -41,7 +41,7 @@ steps:
         **/*.dll
         !**/python36.dll
 
-  - powershell: npm run package win-installer
+  - pwsh: npm run package win-installer
     workingDirectory: desktop
     displayName: Build installer
 
@@ -51,7 +51,7 @@ steps:
       pattern: |
         **/BatchExplorer*Setup*.exe
 
-  - powershell: npm run package win-manifest
+  - pwsh: npm run package win-manifest
     workingDirectory: desktop
     displayName: Create manifest
   - template: ../common/generate-sbom.yml

diff --git a/.vsts/win/security-analysis.yml b/.vsts/win/security-analysis.yml
@@ -1,10 +1,10 @@
 steps:
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@4
     displayName: "AntiMalware Scanner"
     inputs:
       EnableServices: true
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
     displayName: "Publish Security Analysis Logs"
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1

diff --git a/.vsts/win/win-dependencies.yml b/.vsts/win/win-dependencies.yml
@@ -1,6 +1,6 @@
 steps:
   - template: ../dependencies.yml
-  - powershell: |
+  - pwsh: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
       exec { Write-Host "Node.js version" $(node --version) }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 2.21.0
+
+[All items](https://github.com/Azure/BatchExplorer/milestone/55?closed=1)
+
+### Feature
+
+* Allows users to select browser for authentication during reauthenticate flow [\#2933](https://github.com/Azure/BatchExplorer/issues/2933)
+
+### Bug
+
+* Fix MacOS Notarization [\#2944](https://github.com/Azure/BatchExplorer/issues/2944)
+* Cannot use proxy settings window [\#2937](https://github.com/Azure/BatchExplorer/issues/2937)
+
+### Other
+
+* Dependency and component governance updates [\#2945](https://github.com/Azure/BatchExplorer/issues/2945)
+
 # 2.20.0
 
 [All items](https://github.com/Azure/BatchExplorer/milestone/54?closed=1)