Skip to content

Commit 9ffffc7

Browse files
committed
Use delegation SAS for internal builds
1 parent a1950ff commit 9ffffc7

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed

.vsts-ci-richnav.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ pr: none
1010
variables:
1111
- name: teamName
1212
value: Roslyn-Project-System
13-
- name: _DotNetPublishToBlobFeed
14-
value: false
15-
- name: _DotNetArtifactsCategory
16-
value: .NETCore
17-
- name: _DotNetValidationArtifactsCategory
18-
value: .NETCore
1913
- name: _PublishToAzure
2014
value: false
2115
- name: PostBuildSign
@@ -52,6 +46,7 @@ stages:
5246
- _SignArgs: ''
5347
- _InternalRuntimeDownloadArgs: ''
5448
steps:
49+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
5550
- powershell: eng\common\build.ps1
5651
-restore
5752
-ci
@@ -67,7 +62,6 @@ stages:
6762
displayName: Build
6863
env:
6964
BuildConfig: $(_BuildConfig)
70-
BlobFeedUrl: $(PB_PublishBlobFeedUrl)
7165
PublishType: $(_PublishType)
7266
TestFullMSBuild: 'true'
7367
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

.vsts-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ variables:
2222
- name: _InternalRuntimeDownloadArgs
2323
value: ''
2424
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
25-
- name: _DotNetPublishToBlobFeed
26-
value: true
2725
- name: Codeql.Enabled
2826
value: true
29-
- group: DotNetBuilds storage account read tokens
3027
- name: _InternalRuntimeDownloadArgs
3128
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
3229
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
@@ -104,6 +101,7 @@ extends:
104101
value: ''
105102
- template: /eng/common/templates-official/job/source-build.yml@self
106103
parameters:
104+
enableInternalSources: true
107105
platform:
108106
name: 'Managed'
109107
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'

.vsts-pr.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,16 @@ pr:
1717
variables:
1818
- name: teamName
1919
value: Roslyn-Project-System
20-
- name: _DotNetPublishToBlobFeed
21-
value: false
2220
- name: _CIBuild
2321
value: -restore -build -sign -pack -ci
24-
- name: _DotNetArtifactsCategory
25-
value: .NETCore
26-
- name: _DotNetValidationArtifactsCategory
27-
value: .NETCore
2822
- name: PostBuildSign
2923
value: true
3024
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
3125
- name: _InternalRuntimeDownloadArgs
3226
value: ''
3327
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
34-
- name: _DotNetPublishToBlobFeed
35-
value: true
3628
- name: Codeql.Enabled
3729
value: true
38-
- group: DotNetBuilds storage account read tokens
3930
- name: _InternalRuntimeDownloadArgs
4031
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
4132
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
@@ -85,6 +76,7 @@ stages:
8576
_Test: ''
8677
- template: /eng/common/templates/job/source-build.yml
8778
parameters:
79+
enableInternalSources: true
8880
platform:
8981
name: 'Managed'
9082
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'

eng/build-pr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
6565
env:
6666
Token: $(dn-bot-dnceng-artifact-feeds-rw)
67+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
68+
6769
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
6870
- powershell: eng\common\build.ps1
6971
$(_CIBuild)

eng/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
7676
env:
7777
Token: $(dn-bot-dnceng-artifact-feeds-rw)
78+
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
7879
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
7980
- powershell: eng\common\build.ps1
8081
$(_CIBuild)

0 commit comments

Comments
 (0)