Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarunramsinghani
tarunramsinghani authored Jan 3, 2025
2 parents b04b9f3 + 93a10ac commit ff3e65a
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 61 deletions.
112 changes: 56 additions & 56 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

ci/ @microsoft/akvelon-build-task-team
ci/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/AndroidSigningV2/ @microsoft/akvelon-build-task-team
Tasks/AndroidSigningV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/AndroidSigningV3/ @microsoft/akvelon-build-task-team
Tasks/AndroidSigningV3/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/ANTV1/ @microsoft/akvelon-build-task-team
Tasks/ANTV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/AppCenterDistributeV1/ @imenkov @lucen-ms @DergachevE

Expand All @@ -15,7 +15,7 @@ Tasks/AppCenterDistributeV3/ @imenkov @lucen-ms @DergachevE

Tasks/AppCenterTestV1/ @imenkov @lucen-ms @DergachevE

Tasks/ArchiveFilesV2/ @microsoft/akvelon-build-task-team
Tasks/ArchiveFilesV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

# DRI Rotation for @microsoft/release-management-task-team : DRI-ReleaseManagement
Tasks/AzureAppConfigurationExportV10/ @microsoft/azure-appconfig-team
Expand Down Expand Up @@ -112,9 +112,9 @@ Tasks/AzureVmssDeploymentV0/ @microsoft/release-management-task-team @manolera

Tasks/AzureVmssDeploymentV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/BashV3/ @microsoft/akvelon-build-task-team
Tasks/BashV3/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/BatchScriptV1/ @microsoft/akvelon-build-task-team
Tasks/BatchScriptV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CacheV2/ @johnterickson

Expand All @@ -128,11 +128,11 @@ Tasks/ChefV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/ChefKnifeV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/CMakeV1/ @microsoft/akvelon-build-task-team
Tasks/CMakeV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CmdLineV2/ @microsoft/akvelon-build-task-team
Tasks/CmdLineV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CocoaPodsV0/ @microsoft/akvelon-build-task-team
Tasks/CocoaPodsV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/Common/artifacts-common/ @microsoft/azure-artifacts-packages

Expand Down Expand Up @@ -172,23 +172,23 @@ Tasks/Common/webdeployment-common/ @microsoft/release-management-task-team @ma

Tasks/CondaAuthenticateV0/ @microsoft/azure-artifacts-packages

Tasks/CondaEnvironmentV0/ @microsoft/akvelon-build-task-team
Tasks/CondaEnvironmentV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CondaEnvironmentV1/ @microsoft/akvelon-build-task-team
Tasks/CondaEnvironmentV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/ContainerBuildV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/CopyFilesV2/ @microsoft/akvelon-build-task-team
Tasks/CopyFilesV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CopyFilesOverSSHV0/ @microsoft/akvelon-build-task-team
Tasks/CopyFilesOverSSHV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/CUrlUploaderV2/ @microsoft/akvelon-build-task-team
Tasks/CUrlUploaderV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/DecryptFileV1/ @microsoft/akvelon-build-task-team
Tasks/DecryptFileV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/DelayV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/DeleteFilesV1/ @microsoft/akvelon-build-task-team
Tasks/DeleteFilesV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/DeployVisualStudioTestAgentV2/ @rasunkar @microsoft\adoautotest

Expand All @@ -204,11 +204,11 @@ Tasks/DockerComposeV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/DockerInstallerV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/DotNetCoreCLIV2/ @microsoft/akvelon-build-task-team @DergachevE
Tasks/DotNetCoreCLIV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani @DergachevE

Tasks/DotNetCoreInstallerV0/ @microsoft/akvelon-build-task-team @DergachevE
Tasks/DotNetCoreInstallerV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani @DergachevE

Tasks/DotNetCoreInstallerV1/ @microsoft/akvelon-build-task-team @DergachevE
Tasks/DotNetCoreInstallerV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani @DergachevE

Tasks/DownloadBuildArtifactsV0/ @microsoft/release-management-task-team @manolerazvan

Expand All @@ -230,19 +230,19 @@ Tasks/DownloadPipelineArtifactV1/ @carl-tanner @fadnavistanmay @b-barthel @

Tasks/DownloadPipelineArtifactV2/ @carl-tanner @fadnavistanmay @b-barthel @kutsen99 @kunalkaroth

Tasks/DownloadSecureFileV1/ @microsoft/akvelon-build-task-team
Tasks/DownloadSecureFileV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/DuffleInstallerV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/ExtractFilesV1/ @microsoft/akvelon-build-task-team
Tasks/ExtractFilesV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/FileTransformV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/FileTransformV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/FtpUploadV1/ @microsoft/akvelon-build-task-team
Tasks/FtpUploadV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/FtpUploadV2/ @microsoft/akvelon-build-task-team
Tasks/FtpUploadV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/FuncToolsInstallerV0/ @microsoft/release-management-task-team @manolerazvan

Expand All @@ -256,15 +256,15 @@ Tasks/GoV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/GoToolV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/GradleV2/ @microsoft/akvelon-build-task-team
Tasks/GradleV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/GradleV3/ @microsoft/akvelon-build-task-team
Tasks/GradleV3/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/GruntV0/ @microsoft/akvelon-build-task-team
Tasks/GruntV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/GulpV0/ @microsoft/akvelon-build-task-team
Tasks/GulpV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/GulpV1/ @microsoft/akvelon-build-task-team
Tasks/GulpV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/HelmDeployV0/ @microsoft/release-management-task-team @manolerazvan

Expand All @@ -280,23 +280,23 @@ Tasks/IISWebAppDeploymentOnMachineGroupV0/ @microsoft/release-management-task

Tasks/IISWebAppManagementOnMachineGroupV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/InstallAppleCertificateV2/ @microsoft/akvelon-build-task-team
Tasks/InstallAppleCertificateV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/InstallAppleProvisioningProfileV1/ @microsoft/akvelon-build-task-team
Tasks/InstallAppleProvisioningProfileV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/InstallSSHKeyV0/ @microsoft/akvelon-build-task-team
Tasks/InstallSSHKeyV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/InvokeRestApiV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/JavaToolInstallerV0/ @microsoft/akvelon-build-task-team
Tasks/JavaToolInstallerV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/JavaToolInstallerV1/ @microsoft/akvelon-build-task-team
Tasks/JavaToolInstallerV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/JenkinsDownloadArtifactsV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/JenkinsDownloadArtifactsV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/JenkinsQueueJobV2/ @microsoft/akvelon-build-task-team
Tasks/JenkinsQueueJobV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/KubectlInstallerV0/ @microsoft/release-management-task-team @manolerazvan

Expand All @@ -318,19 +318,19 @@ Tasks/ManualValidationV1/ @microsoft/release-management-task-team @manolera

Tasks/MavenAuthenticateV0/ @microsoft/azure-artifacts-packages

Tasks/MavenV2/ @microsoft/akvelon-build-task-team
Tasks/MavenV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/MavenV3/ @microsoft/akvelon-build-task-team
Tasks/MavenV3/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/MavenV4/ @microsoft/akvelon-build-task-team
Tasks/MavenV4/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/MSBuildV1/ @microsoft/akvelon-build-task-team
Tasks/MSBuildV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/MysqlDeploymentOnMachineGroupV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/NodeTaskRunnerInstallerV0/ @microsoft/akvelon-build-task-team
Tasks/NodeTaskRunnerInstallerV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/NodeToolV0/ @microsoft/akvelon-build-task-team
Tasks/NodeToolV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

# DRI rotation: Azure Container Registry / Triage
Tasks/NotationV0/ @Azure/azure-container-registry @JeyJeyGao @Two-Hearts @shizhMSFT
Expand Down Expand Up @@ -369,15 +369,15 @@ Tasks/PipAuthenticateV0/ @microsoft/azure-artifacts-packages

Tasks/PipAuthenticateV1/ @microsoft/azure-artifacts-packages

Tasks/PowerShellV2/ @microsoft/akvelon-build-task-team
Tasks/PowerShellV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/PowerShellOnTargetMachinesV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/PowerShellOnTargetMachinesV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/PowerShellOnTargetMachinesV3/ @microsoft/release-management-task-team @manolerazvan

Tasks/PublishBuildArtifactsV1/ @microsoft/akvelon-build-task-team
Tasks/PublishBuildArtifactsV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/PublishCodeCoverageResultsV1/ @rasunkar @microsoft\adoautotest

Expand All @@ -401,9 +401,9 @@ Tasks/PublishToAzureServiceBusV1/ @microsoft/release-management-task-team @m

Tasks/PublishToAzureServiceBusV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/PyPIPublisherV0/ @microsoft/akvelon-build-task-team
Tasks/PyPIPublisherV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/PythonScriptV0/ @microsoft/akvelon-build-task-team
Tasks/PythonScriptV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/QueryWorkItemsV0/ @microsoft/release-management-task-team @manolerazvan

Expand All @@ -425,31 +425,31 @@ Tasks/ServiceFabricPowerShellV1/ @microsoft/release-management-task-team @manol

Tasks/ServiceFabricUpdateManifestsV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/ShellScriptV2/ @microsoft/akvelon-build-task-team
Tasks/ShellScriptV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/SqlAzureDacpacDeploymentV1/ @microsoft/release-management-task-team @manolerazvan

Tasks/SqlDacpacDeploymentOnMachineGroupV0/ @microsoft/release-management-task-team @manolerazvan

Tasks/SqlServerDacpacDeployment/ @microsoft/release-management-task-team @manolerazvan

Tasks/SshV0/ @microsoft/akvelon-build-task-team
Tasks/SshV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/TwineAuthenticateV0/ @microsoft/azure-artifacts-packages

Tasks/TwineAuthenticateV1/ @microsoft/azure-artifacts-packages

Tasks/UniversalPackagesV0/ @microsoft/azure-artifacts-packages

Tasks/UseDotNetV2/ @microsoft/akvelon-build-task-team @DergachevE
Tasks/UseDotNetV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani @DergachevE

Tasks/UseNodeV1/ @microsoft/akvelon-build-task-team
Tasks/UseNodeV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/UsePythonVersionV0/ @microsoft/akvelon-build-task-team
Tasks/UsePythonVersionV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/UseRubyVersionV0/ @microsoft/akvelon-build-task-team
Tasks/UseRubyVersionV0/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/VSBuildV1/ @microsoft/akvelon-build-task-team
Tasks/VSBuildV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/VsTestV1/ @rasunkar @microsoft\adoautotest

Expand All @@ -463,10 +463,10 @@ Tasks/WindowsMachineFileCopyV1/ @microsoft/release-management-task-team @manol

Tasks/WindowsMachineFileCopyV2/ @microsoft/release-management-task-team @manolerazvan

Tasks/XamarinAndroidV1/ @microsoft/akvelon-build-task-team
Tasks/XamarinAndroidV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/XamariniOSV2/ @microsoft/akvelon-build-task-team
Tasks/XamariniOSV2/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/XamarinTestCloudV1/ @microsoft/akvelon-build-task-team
Tasks/XamarinTestCloudV1/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani

Tasks/XcodeV5/ @microsoft/akvelon-build-task-team
Tasks/XcodeV5/ @microsoft/azure-pipelines-tasks-and-agent @tarunramsinghani
21 changes: 18 additions & 3 deletions Tasks/WindowsMachineFileCopyV2/RoboCopyJob.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
$CopyJob = {
$featureFlags = @{
ModifyNumberOfRetriesInRobocopy = [System.Convert]::ToBoolean($env:MODIFY_NUMBER_OF_RETRIES_IN_ROBOCOPY)
}
$ModifyRoboCopyRetries= $featureFlags.ModifyNumberOfRetriesInRobocopy

$CopyJob = {
param (
[string]$fqdn,
[string]$sourcePath,
Expand Down Expand Up @@ -101,7 +106,12 @@ param (

function Clean-Target
{
$cleanupArgument = "/NOCOPY /E /PURGE"
if(-not $ModifyRoboCopyRetries){
$cleanupArgument = "/NOCOPY /E /PURGE"
}
else{
$cleanupArgument = "/NOCOPY /E /PURGE /R:3 "
}
$guid = [GUID]::NewGuid()
$tempDirectory = "$scriptRoot\temp$guid"
New-Item -ItemType Directory -Force -Path $tempDirectory
Expand All @@ -128,7 +138,12 @@ param (
[switch]$fileCopy
)
{
$robocopyParameters = "/COPY:DAT "
if(-not $ModifyRoboCopyRetries){
$robocopyParameters = "/COPY:DAT "
}
else{
$robocopyParameters = "/COPY:DAT /R:3 "
}

if(-not $fileCopy.IsPresent)
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV2/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 242,
"Minor": 251,
"Patch": 0
},
"releaseNotes": "What's new in Version 2.0: <br/>&nbsp;&nbsp;Proxy support is being added. <br/>&nbsp;&nbsp; Removed support of legacy DTL machines.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV2/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 242,
"Minor": 251,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down

0 comments on commit ff3e65a

Please sign in to comment.