Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PublishBuildArtifactsV1] Delete hardcoded "/E" option not to copy subdirectories #15046

Merged
8 commits merged into from
Aug 10, 2021
Merged

[PublishBuildArtifactsV1] Delete hardcoded "/E" option not to copy subdirectories #15046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cae3d4a
Delete hardcoded "/E" option and move this option to separate variable
Jul 15, 2021
3a5d182
Merge branch 'master' into users/tatyana-kostromskaya/fix_14984_Publi…
Aug 4, 2021
07ab1dd
Update task.json
Aug 4, 2021
7efdc64
Update task.loc.json
Aug 4, 2021
561f930
Merge branch 'master' into users/tatyana-kostromskaya/fix_14984_Publi…
Aug 5, 2021
2113aa8
Merge branch 'master' into users/tatyana-kostromskaya/fix_14984_Publi…
Aug 9, 2021
8d2f2a9
Bump version
Aug 9, 2021
24b994e
Merge branch 'master' into users/tatyana-kostromskaya/fix_14984_Publi…
Aug 10, 2021
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
11 changes: 6 additions & 5 deletions Tasks/PublishBuildArtifactsV1/Invoke-Robocopy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ $writer = New-Object System.IO.StreamWriter($stdout, $utf8)
# PowerShell 4, Write-Host and Out-Default do not consider the updated stream writer.

if (!$File) {
$File = "*";
$File = "*";
$CopySubFoldersOption = "/E"
}

# Print the ##command. The /MT parameter is only supported on 2008 R2 and higher.
if ($ParallelCount -gt 1) {
[System.Console]::WriteLine("##[command]robocopy.exe /E /COPY:DA /NP /R:3 /MT:$ParallelCount `"$Source`" `"$Target`" `"$File`"")
[System.Console]::WriteLine("##[command]robocopy.exe $CopySubFoldersOption /COPY:DA /NP /R:3 /MT:$ParallelCount `"$Source`" `"$Target`" `"$File`"")
}
else {
[System.Console]::WriteLine("##[command]robocopy.exe /E /COPY:DA /NP /R:3 `"$Source`" `"$Target`" `"$File`"")
[System.Console]::WriteLine("##[command]robocopy.exe $CopySubFoldersOption /COPY:DA /NP /R:3 `"$Source`" `"$Target`" `"$File`"")
}

# The $OutputEncoding variable instructs PowerShell how to interpret the output
Expand All @@ -74,7 +75,7 @@ $OutputEncoding = [System.Text.Encoding]::Default
#
# Note, the /MT parameter is only supported on 2008 R2 and higher.
if ($ParallelCount -gt 1) {
& robocopy.exe /E /COPY:DA /NP /R:3 /MT:$ParallelCount $Source $Target $File 2>&1 |
& robocopy.exe $CopySubFoldersOption /COPY:DA /NP /R:3 /MT:$ParallelCount $Source $Target $File 2>&1 |
ForEach-Object {
if ($_ -is [System.Management.Automation.ErrorRecord]) {
[System.Console]::WriteLine($_.Exception.Message)
Expand All @@ -85,7 +86,7 @@ if ($ParallelCount -gt 1) {
}
}
else {
& robocopy.exe /E /COPY:DA /NP /R:3 $Source $Target $File 2>&1 |
& robocopy.exe $CopySubFoldersOption /COPY:DA /NP /R:3 $Source $Target $File 2>&1 |
anatolybolshakov marked this conversation as resolved.
Show resolved Hide resolved
ForEach-Object {
if ($_ -is [System.Management.Automation.ErrorRecord]) {
[System.Console]::WriteLine($_.Exception.Message)
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishBuildArtifactsV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 186,
"Minor": 192,
"Patch": 0
},
"demands": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishBuildArtifactsV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 186,
"Minor": 192,
"Patch": 0
},
"demands": [],
Expand Down