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

Fix PowerShellV2 task for old PowerShell versions #18904

Merged
merged 9 commits into from
Sep 12, 2023
+11 −16
Merged

Fix PowerShellV2 task for old PowerShell versions #18904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
877b5f8
Remove class usage
Aug 30, 2023
00f32f4
Bump version to 2.227.1
Aug 31, 2023
be84896
Remove invalid import
Aug 31, 2023
d49c1bf
Fix flags log
Aug 31, 2023
50ef52d
Merge branch 'master' into users/KonstantinTyukalov/Fix_powershellV2
KonstantinTyukalov Sep 5, 2023
68c9643
Bump task to 2.228.0
Sep 5, 2023
f6023af
Merge branch 'master' into users/KonstantinTyukalov/Fix_powershellV2
KonstantinTyukalov Sep 5, 2023
5f2b999
Merge branch 'master' into users/KonstantinTyukalov/Fix_powershellV2
KonstantinTyukalov Sep 8, 2023
31e60e3
Merge branch 'master' into users/KonstantinTyukalov/Fix_powershellV2
LeftTwixWand Sep 12, 2023
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
5 changes: 0 additions & 5 deletions Tasks/PowerShellV2/errors.ps1
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions Tasks/PowerShellV2/helpers.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
. $PSScriptRoot\errors.ps1

function Publish-Telemetry($Telemetry) {
$area = 'TaskHub'
$feature = 'PowerShellV2'
Expand Down Expand Up @@ -220,7 +218,7 @@ function Test-FileArgs([string]$inputArguments) {
}

## get values of all keys
Write-Debug "Feature flags state: @featureFlags"
Write-Debug "Feature flags state: $($featureFlags | ConvertTo-Json -Compress)"

if ($featureFlags.activate -or $featureFlags.audit -or $featureFlags.telemetry) {
Write-Debug "Validating file arguments."
Expand All @@ -240,7 +238,7 @@ function Test-FileArgs([string]$inputArguments) {
if ($sanitizedArgs -ne $expandedArgs) {
$message = Get-VstsLocString -Key 'ScriptArgsSanitized';
if ($featureFlags.activate) {
throw [ArgsSanitizingException] $message;
throw $message;
}
if ($featureFlags.audit) {
Write-Warning $message;
Expand Down
12 changes: 7 additions & 5 deletions Tasks/PowerShellV2/powershell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
param()

. $PSScriptRoot\helpers.ps1
. $PSScriptRoot\errors.ps1

function Get-ActionPreference {
param (
Expand Down Expand Up @@ -99,12 +98,15 @@ try {
try {
Test-FileArgs $input_arguments
}
catch [ArgsSanitizingException] {
throw
}
catch {
$message = $_.Exception.Message

if ($message -eq (Get-VstsLocString -Key 'ScriptArgsSanitized')) {
throw $message;
}

$telemetry = @{
'UnexpectedError' = $_.Exception.Message
'UnexpectedError' = $message
'ErrorStackTrace' = $_.Exception.StackTrace
}
Publish-Telemetry $telemetry
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PowerShellV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 227,
"Minor": 228,
"Patch": 0
},
"releaseNotes": "Script task consistency. Added support for macOS and Linux.",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PowerShellV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 227,
"Minor": 228,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down