From 8eb3ff9b97626b2526ec417a06ee9246772e5260 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Tue, 2 Jul 2024 09:41:57 -0700
Subject: [PATCH] Use delegation SAS for internal builds

---
 .vsts-ci.yml     | 2 --
 .vsts-pr.yml     | 1 -
 eng/build-pr.yml | 2 +-
 eng/build.yml    | 1 +
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 1461605be..9dd53a10e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -19,7 +19,6 @@ variables:
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - name: Codeql.Enabled
     value: true
-  - group: DotNet-DotNetCli-Storage
   - group: DotNet-Installer-SDLValidation-Params
   - name: _PublishUsingPipelines
     value: true
@@ -36,7 +35,6 @@ variables:
 - name: _InternalRuntimeDownloadArgs
   value: ''
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-  - group: DotNetBuilds storage account read tokens
   - name: _InternalRuntimeDownloadArgs
     value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
       /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
index 4fb55d65e..961efdb90 100644
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@@ -34,7 +34,6 @@ variables:
 - name: _InternalRuntimeDownloadArgs
   value: ''
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-  - group: DotNetBuilds storage account read tokens
   - name: _InternalRuntimeDownloadArgs
     value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
       /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
diff --git a/eng/build-pr.yml b/eng/build-pr.yml
index f05d66fa6..653774872 100644
--- a/eng/build-pr.yml
+++ b/eng/build-pr.yml
@@ -66,6 +66,7 @@ phases:
     steps:
     - checkout: self
       clean: true
+    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - ${{ if ne(variables['System.TeamProject'], 'public') }}:
         - task: PowerShell@2
@@ -96,7 +97,6 @@ phases:
             arguments: $(Build.SourcesDirectory)/NuGet.config $Token
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
-
     - ${{ if eq(parameters.agentOs, 'Linux') }}:
       - script: ./build.sh
                   $(_TestArg) $(_PackArg)
diff --git a/eng/build.yml b/eng/build.yml
index 2ce873c3d..84d86839b 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -66,6 +66,7 @@ phases:
     steps:
     - checkout: self
       clean: true
+    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
     - ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
       - ${{ if ne(variables['System.TeamProject'], 'public') }}:
         - task: PowerShell@2