From 2f5b318aecc29ea1a6d90ff0e378b1d2ab0471db Mon Sep 17 00:00:00 2001 From: goagain Date: Fri, 17 Nov 2023 15:04:58 -0800 Subject: [PATCH] Remove ESRP NuGet feed (#357) Office is a downstream of ESRP stream, which means we can always download `Microsoft.EsrpClient` from existing Office feed. By removing the feed and redirecting to Office, we no longer need to maintain 2 separate NuGet token. `ADO_TOKEN` will be enough. --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1d11028..382cf342 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -104,10 +104,10 @@ jobs: - name: Download ESRPClient.exe env: ESRP_VERSION: ${{ secrets.ESRP_VERSION }} - NUGET_CREDENTIALS: ${{ secrets.NUGET_CREDENTIALS }} + NUGET_CREDENTIALS: ${{ secrets.ADO_TOKEN }} run: | - nuget sources add -Name esrp -Username esrp-downloader -Password $env:NUGET_CREDENTIALS -Source https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json - nuget install Microsoft.EsrpClient -Version "$env:ESRP_VERSION" -OutputDirectory .\esrp -Source https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json + nuget sources add -Name esrp -Username esrp-downloader -Password $env:NUGET_CREDENTIALS -Source https://pkgs.dev.azure.com/office/_packaging/Office/nuget/v3/index.json + nuget install Microsoft.EsrpClient -Version "$env:ESRP_VERSION" -OutputDirectory .\esrp -Source https://pkgs.dev.azure.com/office/_packaging/Office/nuget/v3/index.json - name: Login to Azure uses: azure/login@v1 with: