From a3900203ece3ef042d6371d5ee769e18da48efe5 Mon Sep 17 00:00:00 2001 From: v-snalawade Date: Wed, 12 Jun 2024 17:24:19 +0530 Subject: [PATCH] fixed AzCopy path for useSanitizerActivate --- Tasks/AzureFileCopyV4/Utility.ps1 | 5 +++-- Tasks/AzureFileCopyV4/task.json | 2 +- Tasks/AzureFileCopyV4/task.loc.json | 2 +- Tasks/AzureFileCopyV5/Utility.ps1 | 5 +++-- Tasks/AzureFileCopyV5/task.json | 2 +- Tasks/AzureFileCopyV5/task.loc.json | 2 +- Tasks/AzureFileCopyV6/Utility.ps1 | 5 +++-- Tasks/AzureFileCopyV6/task.json | 2 +- Tasks/AzureFileCopyV6/task.loc.json | 2 +- _generated/AzureFileCopyV4.versionmap.txt | 4 ++-- _generated/AzureFileCopyV4/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV4/task.json | 6 +++--- _generated/AzureFileCopyV4/task.loc.json | 6 +++--- _generated/AzureFileCopyV4_Node20/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV4_Node20/task.json | 6 +++--- _generated/AzureFileCopyV4_Node20/task.loc.json | 6 +++--- _generated/AzureFileCopyV5.versionmap.txt | 4 ++-- _generated/AzureFileCopyV5/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV5/task.json | 6 +++--- _generated/AzureFileCopyV5/task.loc.json | 6 +++--- _generated/AzureFileCopyV5_Node20/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV5_Node20/task.json | 6 +++--- _generated/AzureFileCopyV5_Node20/task.loc.json | 6 +++--- _generated/AzureFileCopyV6.versionmap.txt | 4 ++-- _generated/AzureFileCopyV6/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV6/task.json | 6 +++--- _generated/AzureFileCopyV6/task.loc.json | 6 +++--- _generated/AzureFileCopyV6_Node20/Utility.ps1 | 5 +++-- _generated/AzureFileCopyV6_Node20/task.json | 6 +++--- _generated/AzureFileCopyV6_Node20/task.loc.json | 6 +++--- 30 files changed, 75 insertions(+), 66 deletions(-) diff --git a/Tasks/AzureFileCopyV4/Utility.ps1 b/Tasks/AzureFileCopyV4/Utility.ps1 index 6a18330f2d9c..24a52f1274df 100644 --- a/Tasks/AzureFileCopyV4/Utility.ps1 +++ b/Tasks/AzureFileCopyV4/Utility.ps1 @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/Tasks/AzureFileCopyV4/task.json b/Tasks/AzureFileCopyV4/task.json index 40617ce861e6..c92865bb52d4 100644 --- a/Tasks/AzureFileCopyV4/task.json +++ b/Tasks/AzureFileCopyV4/task.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopyV4/task.loc.json b/Tasks/AzureFileCopyV4/task.loc.json index 244ee334965d..6f755ade14dd 100644 --- a/Tasks/AzureFileCopyV4/task.loc.json +++ b/Tasks/AzureFileCopyV4/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopyV5/Utility.ps1 b/Tasks/AzureFileCopyV5/Utility.ps1 index af3d7aff262a..447d54276660 100644 --- a/Tasks/AzureFileCopyV5/Utility.ps1 +++ b/Tasks/AzureFileCopyV5/Utility.ps1 @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/Tasks/AzureFileCopyV5/task.json b/Tasks/AzureFileCopyV5/task.json index df3ae01f8111..bedab97d5882 100644 --- a/Tasks/AzureFileCopyV5/task.json +++ b/Tasks/AzureFileCopyV5/task.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopyV5/task.loc.json b/Tasks/AzureFileCopyV5/task.loc.json index aa0ebe63160b..119f74718020 100644 --- a/Tasks/AzureFileCopyV5/task.loc.json +++ b/Tasks/AzureFileCopyV5/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopyV6/Utility.ps1 b/Tasks/AzureFileCopyV6/Utility.ps1 index 9027a0deb5d0..5d4347cea7db 100644 --- a/Tasks/AzureFileCopyV6/Utility.ps1 +++ b/Tasks/AzureFileCopyV6/Utility.ps1 @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/Tasks/AzureFileCopyV6/task.json b/Tasks/AzureFileCopyV6/task.json index 24495ed21bbd..118336f7a9f3 100644 --- a/Tasks/AzureFileCopyV6/task.json +++ b/Tasks/AzureFileCopyV6/task.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopyV6/task.loc.json b/Tasks/AzureFileCopyV6/task.loc.json index 2ecf3916781e..d1270aa82805 100644 --- a/Tasks/AzureFileCopyV6/task.loc.json +++ b/Tasks/AzureFileCopyV6/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" diff --git a/_generated/AzureFileCopyV4.versionmap.txt b/_generated/AzureFileCopyV4.versionmap.txt index 5231e421f4ef..cf98dfdb6716 100644 --- a/_generated/AzureFileCopyV4.versionmap.txt +++ b/_generated/AzureFileCopyV4.versionmap.txt @@ -1,2 +1,2 @@ -Default|4.241.2 -Node20_229_2|4.241.3 +Default|4.241.4 +Node20_229_2|4.241.5 diff --git a/_generated/AzureFileCopyV4/Utility.ps1 b/_generated/AzureFileCopyV4/Utility.ps1 index 6a18330f2d9c..24a52f1274df 100644 --- a/_generated/AzureFileCopyV4/Utility.ps1 +++ b/_generated/AzureFileCopyV4/Utility.ps1 @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV4/task.json b/_generated/AzureFileCopyV4/task.json index 031ae8845177..6ad7f545be1c 100644 --- a/_generated/AzureFileCopyV4/task.json +++ b/_generated/AzureFileCopyV4/task.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -301,7 +301,7 @@ "ServicePrincipalError": "There was an error with the service principal used for the deployment." }, "_buildConfigMapping": { - "Default": "4.241.2", - "Node20_229_2": "4.241.3" + "Default": "4.241.4", + "Node20_229_2": "4.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV4/task.loc.json b/_generated/AzureFileCopyV4/task.loc.json index 7e2f37310b30..75dfd8aa0d1d 100644 --- a/_generated/AzureFileCopyV4/task.loc.json +++ b/_generated/AzureFileCopyV4/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -301,7 +301,7 @@ "ServicePrincipalError": "ms-resource:loc.messages.ServicePrincipalError" }, "_buildConfigMapping": { - "Default": "4.241.2", - "Node20_229_2": "4.241.3" + "Default": "4.241.4", + "Node20_229_2": "4.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV4_Node20/Utility.ps1 b/_generated/AzureFileCopyV4_Node20/Utility.ps1 index 6a18330f2d9c..24a52f1274df 100644 --- a/_generated/AzureFileCopyV4_Node20/Utility.ps1 +++ b/_generated/AzureFileCopyV4_Node20/Utility.ps1 @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV4_Node20/task.json b/_generated/AzureFileCopyV4_Node20/task.json index 355bef1d2b1f..1b8b2302ab4b 100644 --- a/_generated/AzureFileCopyV4_Node20/task.json +++ b/_generated/AzureFileCopyV4_Node20/task.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -305,7 +305,7 @@ "ServicePrincipalError": "There was an error with the service principal used for the deployment." }, "_buildConfigMapping": { - "Default": "4.241.2", - "Node20_229_2": "4.241.3" + "Default": "4.241.4", + "Node20_229_2": "4.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV4_Node20/task.loc.json b/_generated/AzureFileCopyV4_Node20/task.loc.json index b82eb3344822..fcd33d01ec52 100644 --- a/_generated/AzureFileCopyV4_Node20/task.loc.json +++ b/_generated/AzureFileCopyV4_Node20/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 4, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -305,7 +305,7 @@ "ServicePrincipalError": "ms-resource:loc.messages.ServicePrincipalError" }, "_buildConfigMapping": { - "Default": "4.241.2", - "Node20_229_2": "4.241.3" + "Default": "4.241.4", + "Node20_229_2": "4.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV5.versionmap.txt b/_generated/AzureFileCopyV5.versionmap.txt index 85f5014ed4e4..cde14cf01e22 100644 --- a/_generated/AzureFileCopyV5.versionmap.txt +++ b/_generated/AzureFileCopyV5.versionmap.txt @@ -1,2 +1,2 @@ -Default|5.241.2 -Node20_229_2|5.241.3 +Default|5.241.4 +Node20_229_2|5.241.5 diff --git a/_generated/AzureFileCopyV5/Utility.ps1 b/_generated/AzureFileCopyV5/Utility.ps1 index af3d7aff262a..447d54276660 100644 --- a/_generated/AzureFileCopyV5/Utility.ps1 +++ b/_generated/AzureFileCopyV5/Utility.ps1 @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV5/task.json b/_generated/AzureFileCopyV5/task.json index 78418fb28d80..0c8b44ddc0f7 100644 --- a/_generated/AzureFileCopyV5/task.json +++ b/_generated/AzureFileCopyV5/task.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -301,7 +301,7 @@ "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent." }, "_buildConfigMapping": { - "Default": "5.241.2", - "Node20_229_2": "5.241.3" + "Default": "5.241.4", + "Node20_229_2": "5.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV5/task.loc.json b/_generated/AzureFileCopyV5/task.loc.json index 1cd3164d5da0..0bbf958639fb 100644 --- a/_generated/AzureFileCopyV5/task.loc.json +++ b/_generated/AzureFileCopyV5/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -301,7 +301,7 @@ "AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound" }, "_buildConfigMapping": { - "Default": "5.241.2", - "Node20_229_2": "5.241.3" + "Default": "5.241.4", + "Node20_229_2": "5.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV5_Node20/Utility.ps1 b/_generated/AzureFileCopyV5_Node20/Utility.ps1 index af3d7aff262a..447d54276660 100644 --- a/_generated/AzureFileCopyV5_Node20/Utility.ps1 +++ b/_generated/AzureFileCopyV5_Node20/Utility.ps1 @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" $uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV5_Node20/task.json b/_generated/AzureFileCopyV5_Node20/task.json index 6a8fb19ca705..b5c7849586f7 100644 --- a/_generated/AzureFileCopyV5_Node20/task.json +++ b/_generated/AzureFileCopyV5_Node20/task.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -305,7 +305,7 @@ "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent." }, "_buildConfigMapping": { - "Default": "5.241.2", - "Node20_229_2": "5.241.3" + "Default": "5.241.4", + "Node20_229_2": "5.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV5_Node20/task.loc.json b/_generated/AzureFileCopyV5_Node20/task.loc.json index 4602193404f5..db3e865b023a 100644 --- a/_generated/AzureFileCopyV5_Node20/task.loc.json +++ b/_generated/AzureFileCopyV5_Node20/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 5, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -305,7 +305,7 @@ "AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound" }, "_buildConfigMapping": { - "Default": "5.241.2", - "Node20_229_2": "5.241.3" + "Default": "5.241.4", + "Node20_229_2": "5.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV6.versionmap.txt b/_generated/AzureFileCopyV6.versionmap.txt index 3a2baa52d6a7..89a5475de342 100644 --- a/_generated/AzureFileCopyV6.versionmap.txt +++ b/_generated/AzureFileCopyV6.versionmap.txt @@ -1,2 +1,2 @@ -Default|6.241.2 -Node20_229_2|6.241.3 +Default|6.241.4 +Node20_229_2|6.241.5 diff --git a/_generated/AzureFileCopyV6/Utility.ps1 b/_generated/AzureFileCopyV6/Utility.ps1 index 9027a0deb5d0..5d4347cea7db 100644 --- a/_generated/AzureFileCopyV6/Utility.ps1 +++ b/_generated/AzureFileCopyV6/Utility.ps1 @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV6/task.json b/_generated/AzureFileCopyV6/task.json index f950344eaa8b..b2e39b293171 100644 --- a/_generated/AzureFileCopyV6/task.json +++ b/_generated/AzureFileCopyV6/task.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -288,7 +288,7 @@ "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent." }, "_buildConfigMapping": { - "Default": "6.241.2", - "Node20_229_2": "6.241.3" + "Default": "6.241.4", + "Node20_229_2": "6.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV6/task.loc.json b/_generated/AzureFileCopyV6/task.loc.json index c1c19661d63f..03ec008bdf40 100644 --- a/_generated/AzureFileCopyV6/task.loc.json +++ b/_generated/AzureFileCopyV6/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 2 + "Patch": 4 }, "demands": [ "azureps" @@ -288,7 +288,7 @@ "AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound" }, "_buildConfigMapping": { - "Default": "6.241.2", - "Node20_229_2": "6.241.3" + "Default": "6.241.4", + "Node20_229_2": "6.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV6_Node20/Utility.ps1 b/_generated/AzureFileCopyV6_Node20/Utility.ps1 index 9027a0deb5d0..5d4347cea7db 100644 --- a/_generated/AzureFileCopyV6_Node20/Utility.ps1 +++ b/_generated/AzureFileCopyV6_Node20/Utility.ps1 @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer if ($useSanitizerActivate) { # Splitting arguments on space, but not on space inside quotes $sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)') - Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" - & azcopy copy $sourcePath $containerURL $sanitizedArguments + Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + $uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments" + Invoke-Expression $uploadCommand } else { Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments" diff --git a/_generated/AzureFileCopyV6_Node20/task.json b/_generated/AzureFileCopyV6_Node20/task.json index 8422b5d1592f..5985256ad7a2 100644 --- a/_generated/AzureFileCopyV6_Node20/task.json +++ b/_generated/AzureFileCopyV6_Node20/task.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -292,7 +292,7 @@ "AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent." }, "_buildConfigMapping": { - "Default": "6.241.2", - "Node20_229_2": "6.241.3" + "Default": "6.241.4", + "Node20_229_2": "6.241.5" } } \ No newline at end of file diff --git a/_generated/AzureFileCopyV6_Node20/task.loc.json b/_generated/AzureFileCopyV6_Node20/task.loc.json index d5c9346b07c1..9204b7c7f423 100644 --- a/_generated/AzureFileCopyV6_Node20/task.loc.json +++ b/_generated/AzureFileCopyV6_Node20/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 6, "Minor": 241, - "Patch": 3 + "Patch": 5 }, "demands": [ "azureps" @@ -292,7 +292,7 @@ "AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound" }, "_buildConfigMapping": { - "Default": "6.241.2", - "Node20_229_2": "6.241.3" + "Default": "6.241.4", + "Node20_229_2": "6.241.5" } } \ No newline at end of file