Skip to content
Merged
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
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<MajorVersion>8</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>7</PatchVersion>
<PatchVersion>8</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
Expand Down
106 changes: 53 additions & 53 deletions eng/pipeline-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,65 +241,65 @@ jobs:
script: '.\eng\copy-wpf.ps1 -testhost -destination .dotnet -$(_BuildConfig) -arch $(_Platform)'
condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))

- task: DownloadPipelineArtifact@2
displayName: Fetch Test Binaries
inputs:
buildType: 'specific'
project: 'cbb18261-c48f-4abb-8651-8cdcb5474649'
pipeline: '81'
buildVersionToDownload: 'latestFromBranch'
branchName: 'refs/heads/main'
downloadPath: '$(System.ArtifactsDirectory)\testbinzip\'
checkDownloadedFiles: true
artifactName: Tests.$(_BuildConfig).$(_Platform).zip
condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))
# - task: DownloadPipelineArtifact@2
# displayName: Fetch Test Binaries
# inputs:
# buildType: 'specific'
# project: 'cbb18261-c48f-4abb-8651-8cdcb5474649'
# pipeline: '81'
# buildVersionToDownload: 'latestFromBranch'
# branchName: 'refs/heads/main'
# downloadPath: '$(System.ArtifactsDirectory)\testbinzip\'
# checkDownloadedFiles: true
# artifactName: Tests.$(_BuildConfig).$(_Platform).zip
# condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))

- task: ExtractFiles@1
displayName: Extract Test Bins
inputs:
archiveFilePatterns: '$(System.ArtifactsDirectory)\testbinzip\*.zip'
destinationFolder: '$(System.ArtifactsDirectory)\testbins'
cleanDestinationFolder: true
overwriteExistingFiles: true
condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))
# - task: ExtractFiles@1
# displayName: Extract Test Bins
# inputs:
# archiveFilePatterns: '$(System.ArtifactsDirectory)\testbinzip\*.zip'
# destinationFolder: '$(System.ArtifactsDirectory)\testbins'
# cleanDestinationFolder: true
# overwriteExistingFiles: true
# condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))

- task: PowerShell@2
displayName: Run Tests
inputs:
targetType: 'inline'
script: '.\CIRunDrts.cmd'
workingDirectory: '$(System.ArtifactsDirectory)\testbins'
condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))
# - task: PowerShell@2
# displayName: Run Tests
# inputs:
# targetType: 'inline'
# script: '.\CIRunDrts.cmd'
# workingDirectory: '$(System.ArtifactsDirectory)\testbins'
# condition: and(eq(variables['System.TeamProject'], 'public'), ne(variables['_Platform'], 'arm64'))

- task: CopyFiles@2
inputs:
SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
Contents: '**'
TargetFolder: '$(System.DefaultWorkingDirectory)\Results\'
CleanTargetFolder: true
OverWrite: true
condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x64'), eq(variables['_BuildConfig'], 'Release'))
# - task: CopyFiles@2
# inputs:
# SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
# Contents: '**'
# TargetFolder: '$(System.DefaultWorkingDirectory)\Results\'
# CleanTargetFolder: true
# OverWrite: true
# condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x64'), eq(variables['_BuildConfig'], 'Release'))

- task: CopyFiles@2
inputs:
SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
Contents: '**'
TargetFolder: '$(System.DefaultWorkingDirectory)\ResultsX86\'
CleanTargetFolder: true
OverWrite: true
condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x86'), eq(variables['_BuildConfig'], 'Release'))
# - task: CopyFiles@2
# inputs:
# SourceFolder: 'C:\Users\cloudtest\AppData\Roaming\QualityVault\Run\Report\'
# Contents: '**'
# TargetFolder: '$(System.DefaultWorkingDirectory)\ResultsX86\'
# CleanTargetFolder: true
# OverWrite: true
# condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x86'), eq(variables['_BuildConfig'], 'Release'))

- task: PublishPipelineArtifact@1
inputs:
artifactName: 'TestResultsX64'
targetPath: '$(System.DefaultWorkingDirectory)\Results\'
condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x64'), eq(variables['_BuildConfig'], 'Release'))
# - task: PublishPipelineArtifact@1
# inputs:
# artifactName: 'TestResultsX64'
# targetPath: '$(System.DefaultWorkingDirectory)\Results\'
# condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x64'), eq(variables['_BuildConfig'], 'Release'))

- task: PublishPipelineArtifact@1
inputs:
artifactName: 'TestResultsX86'
targetPath: '$(System.DefaultWorkingDirectory)\ResultsX86\'
condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x86'), eq(variables['_BuildConfig'], 'Release'))
# - task: PublishPipelineArtifact@1
# inputs:
# artifactName: 'TestResultsX86'
# targetPath: '$(System.DefaultWorkingDirectory)\ResultsX86\'
# condition: and(eq(variables['System.TeamProject'], 'public'), eq(variables['_Platform'], 'x86'), eq(variables['_BuildConfig'], 'Release'))

- task: PublishTestResults@2
inputs:
Expand Down