From 81725931fe117c551f0a2d87168e8c35baa26262 Mon Sep 17 00:00:00 2001 From: Philipson Joseph V Date: Mon, 13 Sep 2021 14:31:39 +0530 Subject: [PATCH 1/3] 14091 Inline scripts not working in v5 with space in the filename #14091 --- Tasks/AzurePowerShellV4/AzurePowerShell.ps1 | 2 +- Tasks/AzurePowerShellV4/task.json | 2 +- Tasks/AzurePowerShellV4/task.loc.json | 4 ++-- Tasks/AzurePowerShellV5/AzurePowerShell.ps1 | 2 +- Tasks/AzurePowerShellV5/task.json | 2 +- Tasks/AzurePowerShellV5/task.loc.json | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 index 228cc59c2802..e2a320c16b51 100644 --- a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 @@ -93,7 +93,7 @@ try { $contents += "`$VerbosePreference = 'continue'" } - $contents += ". $PSScriptRoot\UpdatePSModulePath.ps1 $UpdatePSModulePathArgument" + $contents += ". `"$PSScriptRoot\UpdatePSModulePath.ps1`" $UpdatePSModulePathArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n") } else { diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json index 6a52f432f3c9..9b22e530c01e 100644 --- a/Tasks/AzurePowerShellV4/task.json +++ b/Tasks/AzurePowerShellV4/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 185, + "Minor": 193, "Patch": 0 }, "releaseNotes": "Added support for Az Module and cross platform agents.", diff --git a/Tasks/AzurePowerShellV4/task.loc.json b/Tasks/AzurePowerShellV4/task.loc.json index 319eb5970761..930b65aebdda 100644 --- a/Tasks/AzurePowerShellV4/task.loc.json +++ b/Tasks/AzurePowerShellV4/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 184, - "Patch": 1 + "Minor": 193, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ diff --git a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 index c8d68a385f1a..1b642f4d7075 100644 --- a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 @@ -70,7 +70,7 @@ try } else { $CoreAzArgument = "-endpoint '$endpoint'" } - $contents += ". $PSScriptRoot\CoreAz.ps1 $CoreAzArgument" + $contents += ". `"$PSScriptRoot\CoreAz.ps1`" $CoreAzArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n") diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json index e2f560d47495..c9135bf9d2ca 100644 --- a/Tasks/AzurePowerShellV5/task.json +++ b/Tasks/AzurePowerShellV5/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 185, + "Minor": 193, "Patch": 0 }, "releaseNotes": "Added support for Az Module and cross platform agents.", diff --git a/Tasks/AzurePowerShellV5/task.loc.json b/Tasks/AzurePowerShellV5/task.loc.json index 9590507469ff..9b4a63a72d96 100644 --- a/Tasks/AzurePowerShellV5/task.loc.json +++ b/Tasks/AzurePowerShellV5/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 184, - "Patch": 1 + "Minor": 193, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ From 636cf0ceb5c3f03b3dc9a705dc8293cd769364e9 Mon Sep 17 00:00:00 2001 From: Philipson Joseph V Date: Wed, 22 Sep 2021 19:24:52 +0530 Subject: [PATCH 2/3] Review changnes completed --- Tasks/AzurePowerShellV4/AzurePowerShell.ps1 | 2 +- Tasks/AzurePowerShellV5/AzurePowerShell.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 index e2a320c16b51..0ddeeb9197b6 100644 --- a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 @@ -93,7 +93,7 @@ try { $contents += "`$VerbosePreference = 'continue'" } - $contents += ". `"$PSScriptRoot\UpdatePSModulePath.ps1`" $UpdatePSModulePathArgument" + $contents += ". `'$PSScriptRoot\UpdatePSModulePath.ps1`' $UpdatePSModulePathArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n") } else { diff --git a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 index 1b642f4d7075..cee4396f6e4d 100644 --- a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 @@ -70,7 +70,7 @@ try } else { $CoreAzArgument = "-endpoint '$endpoint'" } - $contents += ". `"$PSScriptRoot\CoreAz.ps1`" $CoreAzArgument" + $contents += ". `'$PSScriptRoot\CoreAz.ps1`' $CoreAzArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n") From eee98aea011b1413efbb9029d2cc462c8b5fc93c Mon Sep 17 00:00:00 2001 From: Philipson Joseph V Date: Thu, 23 Sep 2021 17:24:02 +0530 Subject: [PATCH 3/3] Review comments addressed --- Tasks/AzurePowerShellV4/AzurePowerShell.ps1 | 2 +- Tasks/AzurePowerShellV5/AzurePowerShell.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 index 0ddeeb9197b6..a9b3431e3353 100644 --- a/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV4/AzurePowerShell.ps1 @@ -93,7 +93,7 @@ try { $contents += "`$VerbosePreference = 'continue'" } - $contents += ". `'$PSScriptRoot\UpdatePSModulePath.ps1`' $UpdatePSModulePathArgument" + $contents += ". '$PSScriptRoot\UpdatePSModulePath.ps1' $UpdatePSModulePathArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n") } else { diff --git a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 index cee4396f6e4d..ae12e39606cd 100644 --- a/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 +++ b/Tasks/AzurePowerShellV5/AzurePowerShell.ps1 @@ -70,7 +70,7 @@ try } else { $CoreAzArgument = "-endpoint '$endpoint'" } - $contents += ". `'$PSScriptRoot\CoreAz.ps1`' $CoreAzArgument" + $contents += ". '$PSScriptRoot\CoreAz.ps1' $CoreAzArgument" if ($scriptType -eq "InlineScript") { $contents += "$scriptInline".Replace("`r`n", "`n").Replace("`n", "`r`n")