diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index a9ea99ba6aa..357a4cf57d5 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -35,7 +35,6 @@ steps: '$(akams-client-id)' '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)' - '$(dnceng-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)' '$(System.AccessToken)' ${{parameters.CustomSensitiveDataList}} diff --git a/eng/publishing/v3/publish.yml b/eng/publishing/v3/publish.yml index 383ac1b8e5d..bad62654e07 100644 --- a/eng/publishing/v3/publish.yml +++ b/eng/publishing/v3/publish.yml @@ -12,7 +12,6 @@ stages: displayName: Publish Assets and Symbols timeoutInMinutes: 120 variables: - - group: DotNet-Symbol-Server-Pats - group: AzureDevOps-Artifact-Feeds-Pats - group: Publish-Build-Assets @@ -157,7 +156,6 @@ stages: /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.ArtifactStagingDirectory)/ReleaseConfigs/SymbolPublishingExclusionsFile.txt' /p:TempSymbolsAzureDevOpsOrg='dnceng' - /p:TempSymbolsAzureDevOpsOrgToken='$(dnceng-symbol-server-pat)' /p:SymbolRequestProject='dotnet' ${{ parameters.symbolPublishingAdditionalParameters}} /p:BuildQuality='${{ parameters.buildQuality }}' diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index 90f94d2cee9..dd418c315a0 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -22,6 +22,7 @@ using Microsoft.Arcade.Common; using Microsoft.Build.Framework; using Microsoft.DotNet.Build.Tasks.Feed.Model; +using Azure.Core; using Azure.Identity; using Microsoft.DotNet.ProductConstructionService.Client; using Microsoft.DotNet.ProductConstructionService.Client.Models; @@ -718,7 +719,15 @@ public async Task HandleSymbolPublishingAsync( Task CreatePublishSymbolHelper(string symbolPublishingExclusionsFile, bool publishSpecialClrFiles, bool dryRun) { FrozenSet exclusions = LoadExclusions(symbolPublishingExclusionsFile); - PATCredential creds = new(TempSymbolsAzureDevOpsOrgToken); + + TokenCredential creds = string.IsNullOrEmpty(TempSymbolsAzureDevOpsOrgToken) + ? new DefaultIdentityTokenCredential( + new DefaultIdentityTokenCredentialOptions + { + ManagedIdentityClientId = ManagedIdentityClientId + }) + : new PATCredential(TempSymbolsAzureDevOpsOrgToken); + TaskTracer tracer = new(Log, verbose: true); SymbolPublisherOptions options = new(