diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index 23e68d94ec..1607a90672 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -55,14 +55,18 @@ steps: Inline: | eng/common/scripts/Import-AzModules.ps1 - $subscriptionConfiguration = @' - ${{ parameters.SubscriptionConfiguration }} - '@ | ConvertFrom-Json -AsHashtable; + if ('${{ parameters.SubscriptionConfigurationFilePath }}' -ne '') { $subscriptionConfiguration = ` Get-Content '${{ parameters.SubscriptionConfigurationFilePath }}' ` | ConvertFrom-Json -AsHashtable; + } else { + # Multiline string termination ('@) needs to be at the beginning + # of the line + $subscriptionConfiguration = @' + ${{ parameters.SubscriptionConfiguration }} + '@ | ConvertFrom-Json -AsHashtable; } # The subscriptionConfiguration may have ArmTemplateParameters defined, so diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 9e4b39aa29..89aa7d825e 100644 --- a/eng/common/TestResources/remove-test-resources.yml +++ b/eng/common/TestResources/remove-test-resources.yml @@ -37,14 +37,18 @@ steps: Inline: | eng/common/scripts/Import-AzModules.ps1 - $subscriptionConfiguration = @" - ${{ parameters.SubscriptionConfiguration }} - "@ | ConvertFrom-Json -AsHashtable; if ('${{ parameters.SubscriptionConfigurationFilePath }}' -ne '') { $subscriptionConfiguration = ` Get-Content '${{ parameters.SubscriptionConfigurationFilePath }}' ` | ConvertFrom-Json -AsHashtable; + } else { + # Multiline string termination ("@) needs to be at the beginning + # of the line + $subscriptionConfiguration = @" + ${{ parameters.SubscriptionConfiguration }} + "@ | ConvertFrom-Json -AsHashtable; + } eng/common/TestResources/Remove-TestResources.ps1 `