Skip to content

fix(ci): resolve ESRP_DOMAIN_TENANT_ID cyclical reference blocking all ESRP publishing #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Imran Siddique (imran-siddique) merged 1 commit into from
Apr 13, 2026
Merged

fix(ci): resolve ESRP_DOMAIN_TENANT_ID cyclical reference blocking all ESRP publishing #967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions pipelines/esrp-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,16 @@ parameters:
# Service connection name is hardcoded (required at compile time by ADO).
# All other values sourced from ADO pipeline variables (mark as secret):
# ESRP_KEYVAULT_NAME, ESRP_CERT_IDENTIFIER,
# ESRP_CLIENT_ID, ESRP_DOMAIN_TENANT_ID, ESRP_OWNERS, ESRP_APPROVERS
# ESRP_CLIENT_ID, ESRP_OWNERS, ESRP_APPROVERS
#
# Note: ESRP_DOMAIN_TENANT_ID was removed from pipeline variables due to
# cyclical reference. The Microsoft corporate tenant ID is a well-known
# public value used as the ESRP default.
# -------------------------------------------------------

variables:
MICROSOFT_TENANT_ID: '72f988bf-86f1-41af-91ab-2d7cd011db47'

pool:
vmImage: ubuntu-latest

Expand Down Expand Up @@ -195,7 +202,7 @@ stages:
approvers: '$(ESRP_APPROVERS)'
serviceendpointurl: 'https://api.esrp.microsoft.com'
mainpublisher: 'ESRPRELPACMAN'
domaintenantid: '$(ESRP_DOMAIN_TENANT_ID)'
domaintenantid: '$(MICROSOFT_TENANT_ID)'

# =======================================================
# NPM — 7 packages (@microsoft scope)
Expand Down Expand Up @@ -284,7 +291,7 @@ stages:
approvers: '$(ESRP_APPROVERS)'
serviceendpointurl: 'https://api.esrp.microsoft.com'
mainpublisher: 'ESRPRELPACMAN'
domaintenantid: '$(ESRP_DOMAIN_TENANT_ID)'
domaintenantid: '$(MICROSOFT_TENANT_ID)'

# =======================================================
# NUGET — Microsoft.AgentGovernance
Expand Down Expand Up @@ -364,7 +371,7 @@ stages:
inputs:
ConnectedServiceName: 'Agent Governance Toolkit'
AppRegistrationClientId: '$(ESRP_CLIENT_ID)'
AppRegistrationTenantId: '$(ESRP_DOMAIN_TENANT_ID)'
AppRegistrationTenantId: '$(MICROSOFT_TENANT_ID)'
AuthAKVName: '$(ESRP_KEYVAULT_NAME)'
AuthSignCertName: '$(ESRP_CERT_IDENTIFIER)'
FolderPath: '$(Pipeline.Workspace)/nuget-unsigned'
Expand Down Expand Up @@ -486,7 +493,7 @@ stages:
approvers: '$(ESRP_APPROVERS)'
serviceendpointurl: 'https://api.esrp.microsoft.com'
mainpublisher: 'ESRPRELPACMAN'
domaintenantid: '$(ESRP_DOMAIN_TENANT_ID)'
domaintenantid: '$(MICROSOFT_TENANT_ID)'

# =======================================================
# GO — github.com/microsoft/agent-governance-toolkit module
Expand Down
Loading