From 8351e568e686ee1e55c1657156a6f3a36872520a Mon Sep 17 00:00:00 2001
From: Vladimir Morozov <vmorozov@microsoft.com>
Date: Tue, 16 Dec 2025 16:20:19 -0800
Subject: [PATCH] Release NPM packages in publish pipeline

---
 .ado/publish.yml | 23 +++++++++++++++++++++++
 .ado/release.yml | 40 ----------------------------------------
 2 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/.ado/publish.yml b/.ado/publish.yml
index 7b097e64267..72a488e2fb0 100644
--- a/.ado/publish.yml
+++ b/.ado/publish.yml
@@ -227,6 +227,29 @@ extends:
             parameters:
               buildEnvironment: Continuous
 
+          - script: echo NpmDistTag is $(NpmDistTag)
+            displayName: Show NPM dist tag
+
+          - script: dir /s "$(Pipeline.Workspace)\published-packages"
+            displayName: Show npm packages before ESRP release
+
+          - task: 'SFP.release-tasks.custom-build-release-task.EsrpRelease@10'
+            displayName: 'ESRP Release to npmjs.com'
+            condition: and(succeeded(), ne(variables['NpmDistTag'], ''))
+            inputs:
+              connectedservicename: 'ESRP-CodeSigning-OGX-JSHost-RNW'
+              usemanagedidentity: false
+              keyvaultname: 'OGX-JSHost-KV'
+              authcertname: 'OGX-JSHost-Auth4'
+              signcertname: 'OGX-JSHost-Sign3'
+              clientid: '0a35e01f-eadf-420a-a2bf-def002ba898d'
+              domaintenantid: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+              contenttype: npm
+              folderlocation: '$(Pipeline.Workspace)\published-packages'
+              productstate: '$(NpmDistTag)'
+              owners: 'vmorozov@microsoft.com'
+              approvers: 'khosany@microsoft.com'
+
           - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
             displayName: 📒 Generate Manifest Npm
             inputs:
diff --git a/.ado/release.yml b/.ado/release.yml
index c3a17ad095e..8aa9db3ec64 100644
--- a/.ado/release.yml
+++ b/.ado/release.yml
@@ -29,46 +29,6 @@ extends:
     - stage: Release
       displayName: Publish artifacts
       jobs:
-      - job: PushNpm
-        displayName: npmjs.com - Publish npm packages
-        variables:
-        - group: RNW Secrets
-        timeoutInMinutes: 0
-        templateContext:
-          inputs:
-          - input: pipelineArtifact
-            pipeline: 'Publish'
-            artifactName: 'NpmPackedTarballs'
-            targetPath: '$(Pipeline.Workspace)/published-packages'
-          - input: pipelineArtifact
-            pipeline: 'Publish'
-            artifactName: 'VersionEnvVars'
-            targetPath: '$(Pipeline.Workspace)/VersionEnvVars'
-        steps:
-        - checkout: none
-        - task: CmdLine@2
-          displayName: Apply version variables
-          inputs:
-            script: node $(Pipeline.Workspace)/VersionEnvVars/versionEnvVars.js
-        - script: dir /s "$(Pipeline.Workspace)\published-packages"
-          displayName: Show npm packages
-        - task: 'SFP.release-tasks.custom-build-release-task.EsrpRelease@10'
-          displayName: 'ESRP Release to npmjs.com'
-          condition: and(succeeded(), ne(variables['NpmDistTag'], ''))
-          inputs:
-            connectedservicename: 'ESRP-CodeSigning-OGX-JSHost-RNW'
-            usemanagedidentity: false
-            keyvaultname: 'OGX-JSHost-KV'
-            authcertname: 'OGX-JSHost-Auth4'
-            signcertname: 'OGX-JSHost-Sign3'
-            clientid: '0a35e01f-eadf-420a-a2bf-def002ba898d'
-            domaintenantid: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
-            contenttype: npm
-            folderlocation: '$(Pipeline.Workspace)\published-packages'
-            productstate: '$(NpmDistTag)'
-            owners: 'vmorozov@microsoft.com'
-            approvers: 'khosany@microsoft.com'
-
       - job: PushPrivateAdo
         displayName: ADO - react-native
         timeoutInMinutes: 0