Skip to content

Commit 44db96a

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/5.0' changes
2 parents 8552839 + e17680b commit 44db96a

File tree

6 files changed

+122
-5
lines changed

6 files changed

+122
-5
lines changed

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
variables:
3434
- name: _osParameter
3535
value: -os ${{ parameters.osGroup }}
36-
36+
3737
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
3838
- name: _osParameter
3939
value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}
@@ -54,12 +54,33 @@ jobs:
5454
${{ if ne(parameters.isOfficialBuild, true) }}:
5555
value: ''
5656

57+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
58+
- group: AzureDevOps-Artifact-Feeds-Pats
59+
5760
- ${{ each variable in parameters.variables }}:
5861
- ${{ variable }}
5962

6063
steps:
6164
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
6265

66+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
67+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
68+
- task: Bash@3
69+
displayName: Setup Private Feeds Credentials
70+
inputs:
71+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
72+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
73+
env:
74+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
75+
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
76+
- task: PowerShell@2
77+
displayName: Setup Private Feeds Credentials
78+
inputs:
79+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
80+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
81+
env:
82+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
83+
6384
- ${{ if eq(parameters.isOfficialBuild, true) }}:
6485
- template: /eng/pipelines/common/restore-internal-tools.yml
6586

@@ -76,7 +97,7 @@ jobs:
7697
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter)
7798
displayName: Build product
7899

79-
- ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
100+
- ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
80101
- script: |
81102
du -sh $(Build.SourcesDirectory)/*
82103
df -h

‎eng/pipelines/coreclr/templates/xplat-job.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,31 @@ jobs:
9898
- name: crossArg
9999
value: ''
100100

101+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
102+
- group: AzureDevOps-Artifact-Feeds-Pats
103+
101104
- ${{ each variable in parameters.variables }}:
102105
- ${{insert}}: ${{ variable }}
103106

104107
steps:
105108
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
106109

110+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
111+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
112+
- task: Bash@3
113+
displayName: Setup Private Feeds Credentials
114+
inputs:
115+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
116+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
117+
env:
118+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
119+
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
120+
- task: PowerShell@2
121+
displayName: Setup Private Feeds Credentials
122+
inputs:
123+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
124+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
125+
env:
126+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
127+
107128
- ${{ parameters.steps }}

‎eng/pipelines/installer/jobs/base-job.yml‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ jobs:
7777
- name: SignType
7878
value: test
7979

80+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
81+
- group: AzureDevOps-Artifact-Feeds-Pats
82+
8083
# Set up non-PR build from internal project
8184
- ${{ if eq(parameters.isOfficialBuild, true) }}:
8285
- name: SignType
@@ -420,6 +423,24 @@ jobs:
420423
destinationFolder: $(AllArtifactsDownloadPath)/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}/
421424
cleanUnpackFolder: false
422425

426+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
427+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
428+
- task: Bash@3
429+
displayName: Setup Private Feeds Credentials
430+
inputs:
431+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
432+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
433+
env:
434+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
435+
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
436+
- task: PowerShell@2
437+
displayName: Setup Private Feeds Credentials
438+
inputs:
439+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
440+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
441+
env:
442+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
443+
423444
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
424445
- template: /eng/pipelines/common/download-artifact-step.yml
425446
parameters:
@@ -469,7 +490,7 @@ jobs:
469490
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
470491
- template: /eng/pipelines/common/macos-sign-with-entitlements.yml
471492
parameters:
472-
filesToSign:
493+
filesToSign:
473494
- name: dotnet
474495
path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
475496
entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
@@ -480,7 +501,7 @@ jobs:
480501
- script: $(BaseJobBuildCommand) -subset installer.nocorehost
481502
displayName: Build and Package
482503

483-
- ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
504+
- ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
484505
- script: |
485506
du -sh $(Build.SourcesDirectory)/*
486507
df -h

‎eng/pipelines/libraries/base-job.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ jobs:
8484
- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
8585
- _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)
8686

87+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
88+
- group: AzureDevOps-Artifact-Feeds-Pats
89+
8790
- _runtimeArtifactName: ''
8891
- _runtimeDownloadPath: ''
8992
- _runtimeArtifactsPathArg: ''
@@ -126,6 +129,24 @@ jobs:
126129
steps:
127130
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
128131

132+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
133+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
134+
- task: Bash@3
135+
displayName: Setup Private Feeds Credentials
136+
inputs:
137+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
138+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
139+
env:
140+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
141+
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
142+
- task: PowerShell@2
143+
displayName: Setup Private Feeds Credentials
144+
inputs:
145+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
146+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
147+
env:
148+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
149+
129150
- ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
130151
- template: /eng/pipelines/common/download-artifact-step.yml
131152
parameters:

‎eng/pipelines/mono/templates/xplat-job.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,31 @@ jobs:
8989
- name: _HelixSource
9090
value: ci/dotnet/runtime/$(Build.SourceBranch)
9191

92+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
93+
- group: AzureDevOps-Artifact-Feeds-Pats
94+
9295
- ${{ each variable in parameters.variables }}:
9396
- ${{insert}}: ${{ variable }}
9497

9598
steps:
9699
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
97100

101+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
102+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
103+
- task: Bash@3
104+
displayName: Setup Private Feeds Credentials
105+
inputs:
106+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
107+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
108+
env:
109+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
110+
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
111+
- task: PowerShell@2
112+
displayName: Setup Private Feeds Credentials
113+
inputs:
114+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
115+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
116+
env:
117+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
118+
98119
- ${{ parameters.steps }}

‎eng/pipelines/official/jobs/prepare-signed-artifacts.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,21 @@ jobs:
2020
- name: SignType
2121
value: $[ coalesce(variables.OfficialSignType, 'real') ]
2222

23+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
24+
- group: AzureDevOps-Artifact-Feeds-Pats
25+
2326
steps:
2427
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
2528

29+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
30+
- task: PowerShell@2
31+
displayName: Setup Private Feeds Credentials
32+
inputs:
33+
filePath: $(Build.SourcesDirectory)\eng\common\SetupNugetSources.ps1
34+
arguments: -ConfigFile $(Build.SourcesDirectory)\NuGet.config -Password $Env:Token
35+
env:
36+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
37+
2638
- ${{ if eq(parameters.isOfficialBuild, true) }}:
2739
- task: NuGetAuthenticate@0
2840

@@ -33,7 +45,7 @@ jobs:
3345
zipSources: false
3446
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
3547
continueOnError: false
36-
condition: and(succeeded(),
48+
condition: and(succeeded(),
3749
in(variables['SignType'], 'real', 'test'))
3850

3951
- task: DownloadBuildArtifacts@0

0 commit comments

Comments
 (0)