Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions eng/pipelines/common/download-artifact-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ parameters:

steps:
# Download artifact
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: 'Download ${{ parameters.displayName }}'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/__download__'
artifactName: '${{ parameters.artifactName }}'
checkDownloadedFiles: true
targetPath: '$(Build.SourcesDirectory)/__download__/${{ parameters.artifactName }}'

# Unzip artifact
- task: ExtractFiles@1
Expand Down
10 changes: 4 additions & 6 deletions eng/pipelines/common/download-specific-artifact-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ parameters:

steps:
# Download artifact
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: 'Download specific ${{ parameters.displayName }}'
inputs:
buildType: specific
project: ${{ parameters.project }}
pipeline: ${{ parameters.pipeline }}
definition: ${{ parameters.pipeline }}
buildVersionToDownload: specific
branchName: ${{ parameters.branchName }}
buildId: ${{ parameters.buildId }}
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/__download__'
pipelineId: ${{ parameters.buildId }}
artifactName: '${{ parameters.artifactName }}'
targetPath: '$(Build.SourcesDirectory)/__download__/${{ parameters.artifactName }}'

# Unzip artifact
- task: ExtractFiles@1
Expand Down
15 changes: 6 additions & 9 deletions eng/pipelines/common/templates/browser-wasm-build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ jobs:

preBuildSteps:
# Download single threaded runtime packs, and tasks needed to build WBT
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: Download built nugets for singlethreaded runtime
inputs:
buildType: current
artifactName: 'BuildArtifacts_browser_wasm_$(_hostedOs)_Release_SingleThreaded_BuildOnly'
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/artifacts'
targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_SingleThreaded_BuildOnly'

- task: CopyFiles@2
displayName: Copy single threaded assets
Expand All @@ -69,13 +68,12 @@ jobs:
CleanTargetFolder: false

# Download for multi-threaded
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: Download built nugets for multi-threaded runtime
inputs:
buildType: current
artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/artifacts'
targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'

- task: CopyFiles@2
displayName: Copy multithreading runtime pack
Expand All @@ -86,13 +84,12 @@ jobs:
CleanTargetFolder: false

# Download WBT
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: Download Wasm.Build.Tests
inputs:
buildType: current
artifactName: WasmBuildTests_$(_hostedOs)_SingleThreaded_BuildOnly
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/artifacts'
targetPath: '$(Build.SourcesDirectory)/artifacts/WasmBuildTests_$(_hostedOs)_SingleThreaded_BuildOnly'

- task: CopyFiles@2
displayName: Copy Wasm.Build.Tests archive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,12 @@ jobs:

preBuildSteps:
# Download single threaded runtime packs, and tasks needed to build WBT
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: Download built nugets for singlethreaded runtime
inputs:
buildType: current
artifactName: 'BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR'
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/artifacts'
targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR'

- task: CopyFiles@2
displayName: Copy single threaded assets
Expand All @@ -67,7 +66,7 @@ jobs:
CleanTargetFolder: false

# Download for multi-threaded
# - task: DownloadBuildArtifacts@0
# - task: DownloadPipelineArtifact@2
# displayName: Download built nugets for multi-threaded runtime
# inputs:
# buildType: current
Comment on lines +69 to 72
Expand All @@ -84,13 +83,12 @@ jobs:
# CleanTargetFolder: false

# Download WBT - TODO-WASM: This points to "mono" build, altough
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: Download Wasm.Build.Tests
inputs:
buildType: current
artifactName: WasmBuildTests_$(_hostedOs)_CoreCLR
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/artifacts'
targetPath: '$(Build.SourcesDirectory)/artifacts/WasmBuildTests_$(_hostedOs)_CoreCLR'

- task: CopyFiles@2
displayName: Copy Wasm.Build.Tests archive
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/publish-build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ parameters:

steps:
- ${{ if parameters.isOfficialBuild }}:
- task: 1ES.PublishBuildArtifacts@1
- task: 1ES.PublishPipelineArtifact@1
displayName: ${{ parameters.displayName }}
inputs: ${{ parameters.inputs }}
condition: ${{ parameters.condition }}
- ${{ else }}:
- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: ${{ parameters.displayName }}
inputs: ${{ parameters.inputs }}
condition: ${{ parameters.condition }}
4 changes: 2 additions & 2 deletions eng/pipelines/common/upload-artifact-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ steps:
isOfficialBuild: ${{ parameters.isOfficialBuild }}
displayName: 'Publish ${{ parameters.displayName }}'
inputs:
PathtoPublish: $(Build.StagingDirectory)/${{ parameters.artifactName }}${{ parameters.archiveExtension }}
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.StagingDirectory)/${{ parameters.artifactName }}${{ parameters.archiveExtension }}
artifactName: ${{ parameters.artifactName }}
condition: ${{ parameters.condition }}
5 changes: 2 additions & 3 deletions eng/pipelines/common/upload-intermediate-artifacts-step.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ steps:
isOfficialBuild: ${{ parameters.isOfficialBuild }}
displayName: Publish intermediate artifacts
inputs:
PathtoPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
ArtifactName: IntermediateArtifacts
ArtifactType: container
targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
artifactName: IntermediateArtifacts
10 changes: 4 additions & 6 deletions eng/pipelines/common/wasm-post-build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@ steps:
TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts'
CleanTargetFolder: true

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: Publish intermediate artifacts
condition: and(succeeded(), ${{ parameters.publishArtifactsForWorkload }})
inputs:
pathToPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
artifactName: BuildArtifacts_${{ parameters.osGroup }}_wasm_$(_hostedOs)_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
artifactType: container

- task: CopyFiles@2
displayName: Copy WBT
Expand All @@ -41,10 +40,9 @@ steps:
TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts'
CleanTargetFolder: true

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: Publish Wasm.Build.Tests archive
condition: and(succeeded(), ${{ parameters.publishWBT }})
inputs:
pathToPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
artifactName: WasmBuildTests_$(_hostedOs)_${{ parameters.nameSuffix }}
artifactType: container
6 changes: 3 additions & 3 deletions eng/pipelines/performance/templates/build-perf-bdn-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ steps:
displayName: Build BDN Android App
workingDirectory: $(Build.SourcesDirectory)/maui

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
condition: succeededOrFailed()
displayName: 'Publish Benchmarks.Droid binlog'
inputs:
pathtoPublish: $(Build.SourcesDirectory)/maui/BenchmarksDroid.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/maui/BenchmarksDroid.binlog
artifactName: ${{ parameters.artifactName }}_BenchmarksDroidBinlog_Attempt$(System.JobAttempt)

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
Expand Down
36 changes: 18 additions & 18 deletions eng/pipelines/performance/templates/build-perf-maui-apps-net6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,47 +180,47 @@ steps:
displayName: Build MAUI Blazor MacCatalyst
workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiAndroid binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
artifactName: ${{ parameters.artifactName }}_MauiAndroidBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiiOS binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
artifactName: ${{ parameters.artifactName }}_MauiiOSBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiMacCatalyst binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}_MauiMacCatalystBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiBlazoriOS binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
artifactName: ${{ parameters.artifactName }}_MauiBlazoriOSBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiBlazorMacCatalyst binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}_MauiBlazorMacCatalystBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiiOSPodcast binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
artifactName: ${{ parameters.artifactName }}_MauiiOSPodcastBinlog_Attempt$(System.JobAttempt)

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
Expand Down
36 changes: 18 additions & 18 deletions eng/pipelines/performance/templates/build-perf-maui-apps-net7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,47 +265,47 @@ steps:
displayName: Build MAUI Blazor MacCatalyst
workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiAndroid binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
artifactName: ${{ parameters.artifactName }}_MauiAndroidBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiiOS binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
artifactName: ${{ parameters.artifactName }}_MauiiOSBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiMacCatalyst binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}_MauiMacCatalystBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiBlazoriOS binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
artifactName: ${{ parameters.artifactName }}_MauiBlazoriOSBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiBlazorMacCatalyst binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
artifactName: ${{ parameters.artifactName }}_MauiBlazorMacCatalystBinlog_Attempt$(System.JobAttempt)

- task: PublishBuildArtifacts@1
- task: PublishPipelineArtifact@1
displayName: 'Publish MauiiOSPodcast binlog'
condition: always()
inputs:
pathtoPublish: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
artifactName: ${{ parameters.artifactName }}
targetPath: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
artifactName: ${{ parameters.artifactName }}_MauiiOSPodcastBinlog_Attempt$(System.JobAttempt)

- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
Expand Down
Loading
Loading