Skip to content

Commit cd613cf

Browse files
committed
Merge branch 'release/6.0' into release/7.0
2 parents c502ea4 + 3255350 commit cd613cf

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
try {
1313
. $PSScriptRoot\post-build-utils.ps1
1414

15-
$darc = Get-Darc
15+
$darc = Get-Darc
1616

1717
$optionalParams = [System.Collections.ArrayList]::new()
1818

@@ -46,7 +46,7 @@ try {
4646
}
4747

4848
Write-Host 'done.'
49-
}
49+
}
5050
catch {
5151
Write-Host $_
5252
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."

eng/common/templates/job/publish-build-assets.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
/p:OfficialBuildId=$(Build.BuildNumber)
9393
condition: ${{ parameters.condition }}
9494
continueOnError: ${{ parameters.continueOnError }}
95-
95+
9696
- task: powershell@2
9797
displayName: Create ReleaseConfigs Artifact
9898
inputs:
@@ -101,7 +101,7 @@ jobs:
101101
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
102102
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
103103
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
104-
104+
105105
- task: PublishBuildArtifacts@1
106106
displayName: Publish ReleaseConfigs Artifact
107107
inputs:
@@ -127,7 +127,7 @@ jobs:
127127
128128
- task: PublishBuildArtifacts@1
129129
displayName: Publish SymbolPublishingExclusionsFile Artifact
130-
condition: eq(variables['SymbolExclusionFile'], 'true')
130+
condition: eq(variables['SymbolExclusionFile'], 'true')
131131
inputs:
132132
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
133133
PublishLocation: Container
@@ -154,4 +154,4 @@ jobs:
154154
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
155155
- template: /eng/common/templates/steps/publish-logs.yml
156156
parameters:
157-
JobLabel: 'Publish_Artifacts_Logs'
157+
JobLabel: 'Publish_Artifacts_Logs'

eng/common/templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
enabled: false
2121
# Optional: Include toolset dependencies in the generated graph files
2222
includeToolset: false
23-
23+
2424
# Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
2525
jobs: []
2626

@@ -47,7 +47,7 @@ parameters:
4747
jobs:
4848
- ${{ each job in parameters.jobs }}:
4949
- template: ../job/job.yml
50-
parameters:
50+
parameters:
5151
# pass along parameters
5252
${{ each parameter in parameters }}:
5353
${{ if ne(parameter.key, 'jobs') }}:

eng/common/templates/post-build/post-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ parameters:
3939
displayName: Enable NuGet validation
4040
type: boolean
4141
default: true
42-
42+
4343
- name: publishInstallersAndChecksums
4444
displayName: Publish installers and checksums
4545
type: boolean
@@ -131,8 +131,8 @@ stages:
131131
displayName: Validate
132132
inputs:
133133
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
134-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
134+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
136136

137137
- job:
138138
displayName: Signing Validation
@@ -227,9 +227,9 @@ stages:
227227
displayName: Validate
228228
inputs:
229229
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
230-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
231-
-ExtractPath $(Agent.BuildDirectory)/Extract/
232-
-GHRepoName $(Build.Repository.Name)
230+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
231+
-ExtractPath $(Agent.BuildDirectory)/Extract/
232+
-GHRepoName $(Build.Repository.Name)
233233
-GHCommit $(Build.SourceVersion)
234234
-SourcelinkCliVersion $(SourceLinkCLIVersion)
235235
continueOnError: true

0 commit comments

Comments
 (0)