From eb31021a82e7853772289ad3281edea0670c0f5a Mon Sep 17 00:00:00 2001 From: celloza Date: Sat, 22 Mar 2025 15:03:18 +0000 Subject: [PATCH 1/2] Removed whitespace in logging commands --- Tasks/AzurePowerShellV4/InitializeAz.ps1 | 2 +- Tasks/AzurePowerShellV4/task.json | 4 ++-- Tasks/AzurePowerShellV4/task.loc.json | 4 ++-- Tasks/AzurePowerShellV5/InitializeAz.ps1 | 6 +++--- Tasks/AzurePowerShellV5/task.json | 4 ++-- Tasks/AzurePowerShellV5/task.loc.json | 4 ++-- .../Common/VstsAzureHelpers_/InitializeAzureRMFunctions.ps1 | 2 +- Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1 | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Tasks/AzurePowerShellV4/InitializeAz.ps1 b/Tasks/AzurePowerShellV4/InitializeAz.ps1 index 076d87fe029c..e5ea0d9e2fcd 100644 --- a/Tasks/AzurePowerShellV4/InitializeAz.ps1 +++ b/Tasks/AzurePowerShellV4/InitializeAz.ps1 @@ -97,7 +97,7 @@ if ($endpointObject.scheme -eq 'ServicePrincipal') { $TenantId = $endpointObject.tenantId $additional = @{ TenantId = $TenantId } - Write-Host "##[command] Set-AzContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" + Write-Host "##[command]Set-AzContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" $null = Set-AzContext -SubscriptionId $SubscriptionId @additional } } diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json index d5f02fb9a020..df3e46ac8cd3 100644 --- a/Tasks/AzurePowerShellV4/task.json +++ b/Tasks/AzurePowerShellV4/task.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 254, - "Patch": 1 + "Minor": 255, + "Patch": 0 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ diff --git a/Tasks/AzurePowerShellV4/task.loc.json b/Tasks/AzurePowerShellV4/task.loc.json index b73903e6852f..b4860a20c080 100644 --- a/Tasks/AzurePowerShellV4/task.loc.json +++ b/Tasks/AzurePowerShellV4/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 254, - "Patch": 1 + "Minor": 255, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ diff --git a/Tasks/AzurePowerShellV5/InitializeAz.ps1 b/Tasks/AzurePowerShellV5/InitializeAz.ps1 index 49e065b0e4a5..24db2e4dffc9 100644 --- a/Tasks/AzurePowerShellV5/InitializeAz.ps1 +++ b/Tasks/AzurePowerShellV5/InitializeAz.ps1 @@ -100,21 +100,21 @@ if ($endpointObject.scheme -eq 'ServicePrincipal') { $TenantId = $endpointObject.tenantId $additional = @{ TenantId = $TenantId } - Write-Host "##[command] Set-AzContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" + Write-Host "##[command]Set-AzContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" $null = Set-AzContext -SubscriptionId $SubscriptionId @additional } } elseif ($endpointObject.scheme -eq 'WorkloadIdentityFederation') { Write-Verbose "Using WorkloadIdentityFederation authentication scheme" - $logStr = "##[command] Connect-AzAccount -ServicePrincipal -Tenant $($endpointObject.tenantId) -ApplicationId $($endpointObject.servicePrincipalClientID)" + $logStr = "##[command]Connect-AzAccount -ServicePrincipal -Tenant $($endpointObject.tenantId) -ApplicationId $($endpointObject.servicePrincipalClientID)" $logStr += " -FederatedToken ***** -Environment $environmentName -Scope Process" Write-Host $logStr $null = Connect-AzAccount -ServicePrincipal -Tenant $endpointObject.tenantId -ApplicationId $endpointObject.servicePrincipalClientID ` -FederatedToken $clientAssertionJwt -Environment $environmentName -Scope 'Process' if ($scopeLevel -ne "ManagementGroup") { - Write-Host "##[command] Set-AzContext -SubscriptionId $($endpointObject.subscriptionID) -TenantId $($endpointObject.tenantId)" + Write-Host "##[command]Set-AzContext -SubscriptionId $($endpointObject.subscriptionID) -TenantId $($endpointObject.tenantId)" $null = Set-AzContext -SubscriptionId $endpointObject.subscriptionID -TenantId $endpointObject.tenantId } diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json index 7931411a99ca..7b3e16eda311 100644 --- a/Tasks/AzurePowerShellV5/task.json +++ b/Tasks/AzurePowerShellV5/task.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 254, - "Patch": 2 + "Minor": 255, + "Patch": 0 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ diff --git a/Tasks/AzurePowerShellV5/task.loc.json b/Tasks/AzurePowerShellV5/task.loc.json index 9a4038cac33e..b1153e0b9ee4 100644 --- a/Tasks/AzurePowerShellV5/task.loc.json +++ b/Tasks/AzurePowerShellV5/task.loc.json @@ -17,8 +17,8 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 254, - "Patch": 2 + "Minor": 255, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ diff --git a/Tasks/Common/VstsAzureHelpers_/InitializeAzureRMFunctions.ps1 b/Tasks/Common/VstsAzureHelpers_/InitializeAzureRMFunctions.ps1 index 031d084266b8..f4d57d23829c 100644 --- a/Tasks/Common/VstsAzureHelpers_/InitializeAzureRMFunctions.ps1 +++ b/Tasks/Common/VstsAzureHelpers_/InitializeAzureRMFunctions.ps1 @@ -224,7 +224,7 @@ function Set-CurrentAzureRMSubscriptionV2 { $additional = @{ } if ($TenantId) { $additional['TenantId'] = $TenantId } - Write-Host "##[command] Set-AzureRmContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" + Write-Host "##[command]Set-AzureRmContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)" $null = Set-AzureRmContext -SubscriptionId $SubscriptionId @additional } diff --git a/Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1 b/Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1 index 72ee29f890da..2d496dc9296c 100644 --- a/Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1 +++ b/Tasks/Common/VstsAzureHelpers_/InitializeFunctions.ps1 @@ -130,10 +130,10 @@ function Initialize-AzureSubscription { try { if (Get-Command -Name "Add-AzureRmAccount" -ErrorAction "SilentlyContinue") { - Write-Host "##[command] Add-AzureRMAccount -Credential $psCredential" + Write-Host "##[command]Add-AzureRMAccount -Credential $psCredential" $null = Add-AzureRMAccount -Credential $psCredential } else { - Write-Host "##[command] Connect-AzureRMAccount -Credential $psCredential" + Write-Host "##[command]Connect-AzureRMAccount -Credential $psCredential" $null = Connect-AzureRMAccount -Credential $psCredential } } catch { @@ -151,7 +151,7 @@ function Initialize-AzureSubscription { # Add account (Az). if ($script:azProfileModule) { try { - Write-Host "##[command] Connect-AzAccount -Credential $psCredential" + Write-Host "##[command]Connect-AzAccount -Credential $psCredential" $null = Connect-AzAccount -Credential $psCredential } catch { # Provide an additional, custom, credentials-related error message. From e382e3eb9489e39e6bf7684dd496022eb41596bb Mon Sep 17 00:00:00 2001 From: celloza Date: Tue, 22 Apr 2025 14:03:54 +0100 Subject: [PATCH 2/2] Updated sprint --- Tasks/AzurePowerShellV4/task.json | 2 +- Tasks/AzurePowerShellV4/task.loc.json | 2 +- Tasks/AzurePowerShellV5/task.json | 2 +- Tasks/AzurePowerShellV5/task.loc.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json index df3e46ac8cd3..56c1764fd0a3 100644 --- a/Tasks/AzurePowerShellV4/task.json +++ b/Tasks/AzurePowerShellV4/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 255, + "Minor": 256, "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 b4860a20c080..c7d20f47080e 100644 --- a/Tasks/AzurePowerShellV4/task.loc.json +++ b/Tasks/AzurePowerShellV4/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 4, - "Minor": 255, + "Minor": 256, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json index 7b3e16eda311..55d396d5d41e 100644 --- a/Tasks/AzurePowerShellV5/task.json +++ b/Tasks/AzurePowerShellV5/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 255, + "Minor": 256, "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 b1153e0b9ee4..49daa5704750 100644 --- a/Tasks/AzurePowerShellV5/task.loc.json +++ b/Tasks/AzurePowerShellV5/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 255, + "Minor": 256, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes",