Skip to content

Commit 207ddca

Browse files
Restore branch-specific files
1 parent f53b9c3 commit 207ddca

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

eng/common/core-templates/job/job.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,11 @@ jobs:
125125
- ${{ preStep }}
126126

127127
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
128-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
129-
- task: MicroBuildSigningPlugin@4
130-
displayName: Install MicroBuild plugin
131-
inputs:
132-
signType: $(_SignType)
133-
zipSources: false
134-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
135-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
136-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
137-
${{ else }}:
138-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
139-
env:
140-
TeamName: $(_TeamName)
141-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
128+
- template: /eng/common/core-templates/steps/install-microbuild.yml
129+
parameters:
130+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
131+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132+
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
142133
continueOnError: ${{ parameters.continueOnError }}
143134

144135
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:

eng/common/post-build/publish-using-darc.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ param(
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
88
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9-
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
10+
[Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
1011
)
1112

1213
try {
@@ -39,6 +40,10 @@ try {
3940
$optionalParams.Add("--default-channels-required") | Out-Null
4041
}
4142

43+
if ("true" -eq $SkipAssetsPublishing) {
44+
$optionalParams.Add("--skip-assets-publishing") | Out-Null
45+
}
46+
4247
& $darc add-build-to-channel `
4348
--id $buildId `
4449
--publishing-infra-version $PublishingInfraVersion `

0 commit comments

Comments
 (0)