From 411870d7fdbdf9d633b01be6cc3e85f93c1ecc9b Mon Sep 17 00:00:00 2001
From: Xinyi Joffre <xiou@microsoft.com>
Date: Tue, 18 Mar 2025 09:54:35 -0700
Subject: [PATCH 1/3] Update ESRP release to use PME

---
 .ado/publish.yml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.ado/publish.yml b/.ado/publish.yml
index 664bdddb2..18f300afc 100644
--- a/.ado/publish.yml
+++ b/.ado/publish.yml
@@ -201,21 +201,16 @@ extends:
             assets: |
               $(Build.ArtifactStagingDirectory)/artifacts/wheels/*
 
-        - task: EsrpRelease@7
+        - task: EsrpRelease@9
           condition: ${{ parameters.Publish_Python_Package_To_PyPi }}
           displayName: Sign and publish "azure-quantum" package to PyPi
           inputs:
-            ConnectedServiceName: 'ESRP Signing Connection'
-            KeyVaultName: 'kv-aqua-esrp-001'
-            AuthCertName: 'EsrpAuthCert'
-            SignCertName: 'EsrpSignCert'
-            ClientId: '832c049d-cd07-4c1c-bfa5-c07250d190cb'
-            Intent: 'PackageDistribution'
-            ContentType: 'PyPi'
-            FolderLocation: '$(Build.ArtifactStagingDirectory)/artifacts/wheels'
-            WaitForReleaseCompletion: true
-            Owners: '$(OwnerPersonalAlias)@microsoft.com'                             # Group email here fails the task with non-actionable output.
-            Approvers: 'billti@microsoft.com'
-            ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
-            MainPublisher: 'ESRPRELPACMAN'                                            # Default ESRP v7 publisher. Do not change.
-            DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+            connectedservicename: 'PME ESRP Azure Connection'
+            usemanagedidentity: true
+            keyvaultname: 'quantum-esrp-kv'
+            signcertname: ESRPCert
+            clientid: '832c049d-cd07-4c1c-bfa5-c07250d190cb'
+            contenttype: PyPi
+            domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+            folderlocation: '$(Build.ArtifactStagingDirectory)/artifacts/wheels'
+            waitforreleasecompletion: true

From 4e6e1c51e004f87d23451de2e5ae4f55e3744e2e Mon Sep 17 00:00:00 2001
From: Xinyi Joffre <xiou@microsoft.com>
Date: Tue, 18 Mar 2025 10:29:30 -0700
Subject: [PATCH 2/3] Add approver fields

---
 .ado/publish.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.ado/publish.yml b/.ado/publish.yml
index 18f300afc..6f41c90c4 100644
--- a/.ado/publish.yml
+++ b/.ado/publish.yml
@@ -214,3 +214,6 @@ extends:
             domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
             folderlocation: '$(Build.ArtifactStagingDirectory)/artifacts/wheels'
             waitforreleasecompletion: true
+            owners: 'xiou@microsoft.com' # alias of an owner. owner and approver should be different. sg's and dl's are not supported.
+            approvers: 'xiou@microsoft.com' # alias of an approver, this is auto approved on behalf of this user
+            mainpublisher: ESRPRELPACMAN # Should be your main publisher value, provided at the time of ESRP Release onboarding. Please reachout to esrprelpm@microsoft.com if you don't know this.

From bdc4788572729c227648fdaf2b4affb07619742a Mon Sep 17 00:00:00 2001
From: Xinyi Joffre <xiou@microsoft.com>
Date: Tue, 18 Mar 2025 21:54:49 -0700
Subject: [PATCH 3/3] Remove comments

---
 .ado/publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ado/publish.yml b/.ado/publish.yml
index 6f41c90c4..fd6f6338f 100644
--- a/.ado/publish.yml
+++ b/.ado/publish.yml
@@ -37,7 +37,7 @@ parameters:
 
 variables:
 - name: OwnerPersonalAlias
-  value: 'billti'
+  value: 'xiou'
 - name: QSHARP_PYTHON_TELEMETRY
   value: none # Disable usage telemetry for internal test pipelines
 
@@ -214,6 +214,6 @@ extends:
             domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
             folderlocation: '$(Build.ArtifactStagingDirectory)/artifacts/wheels'
             waitforreleasecompletion: true
-            owners: 'xiou@microsoft.com' # alias of an owner. owner and approver should be different. sg's and dl's are not supported.
-            approvers: 'xiou@microsoft.com' # alias of an approver, this is auto approved on behalf of this user
-            mainpublisher: ESRPRELPACMAN # Should be your main publisher value, provided at the time of ESRP Release onboarding. Please reachout to esrprelpm@microsoft.com if you don't know this.
+            owners: '$(OwnerPersonalAlias)@microsoft.com'
+            approvers: '$(OwnerPersonalAlias)@microsoft.com'
+            mainpublisher: ESRPRELPACMAN