Merge branch 'main' into tejaswis/validateArmLeases

Author: tejaswiMinnu

eng/common/pipelines/templates/archetype-typespec-emitter.yml

@@ -247,7 +247,7 @@ extends:
                 - template: /eng/common/pipelines/templates/steps/create-authenticated-npmrc.yml
                   parameters:
                     npmrcPath: $(buildArtifactsPath)/packages/.npmrc
-                    registryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/
+                    registryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js/npm/registry/
 
                 # publish to devops feed
                 - pwsh: |
@@ -270,7 +270,7 @@ extends:
 
                 - ${{ if parameters.PublishPublic }}:
                   # publish to npmjs.org using ESRP
-                  - task: EsrpRelease@9
+                  - task: EsrpRelease@11
                     inputs:
                       displayName: Publish to npmjs.org
                       ConnectedServiceName: Azure SDK PME Managed Identity

eng/common/pipelines/templates/jobs/npm-publish.yml

@@ -70,7 +70,7 @@ jobs:
   
         - ${{ if eq(parameters.Registry, 'https://registry.npmjs.org/') }}:
 
-          - task: EsrpRelease@9
+          - task: EsrpRelease@11
             displayName: 'Publish ${{ parameters.ArtifactName }} via ESRP'
             condition: and(succeeded(), ne(variables['SkipPublishing'], 'true'))
             inputs:

eng/common/spelling/package-lock.json

@@ -280,9 +280,10 @@ stages:
       - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.CreatePullRequest, true), ne(variables['Build.Reason'], 'PullRequest')) }}:
         - pwsh: |
             $sdkPrBranchName = "$(PrBranch)-$(Build.BuildId)"
+            $sdkRepoBranch = '${{ parameters.SdkRepoBranch }}'
             # use the user provided branch name
             if (($sdkRepoBranch -ne 'main') -and (-not [string]::IsNullOrWhiteSpace($sdkRepoBranch))) {
-              $sdkPrBranchName = '${{ parameters.SdkRepoBranch }}'
+              $sdkPrBranchName = $sdkRepoBranch
             }
             Write-Host "Branch name is set to: $sdkPrBranchName"
             Write-Host "##vso[task.setvariable variable=SdkPullRequestSourceBranch]$sdkPrBranchName"

eng/common/tsp-client/package-lock.json

@@ -25,7 +25,7 @@
     "@azure-tools/specs-shared": "file:../../../.github/shared",
     "@microsoft.azure/openapi-validator": "2.2.4",
     "@microsoft.azure/openapi-validator-core": "1.0.7",
-    "@microsoft.azure/openapi-validator-rulesets": "2.2.4",
+    "@microsoft.azure/openapi-validator-rulesets": "2.2.5",
     "autorest": "^3.7.2",
     "change-case": "^5.4.4",
     "deep-eql": "^5.0.2",

eng/pipelines/templates/stages/archetype-spec-gen-sdk.yml

@@ -20,7 +20,7 @@
   "dependencies": {
     "@actions/core": "^3.0.0",
     "@azure-tools/specs-shared": "file:../../../.github/shared",
-    "@azure/oad": "0.12.3"
+    "@azure/oad": "0.12.4"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",