Skip to content

Commit 625efb4

Browse files
azure-sdkscbedd
andauthored
Sync eng/common directory with azure-sdk-tools for PR 8158 (#1573)
* allow an override FILE to be honored by test-proxy-tool * update local test-framework to honor proxy override version by default --------- Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
1 parent 8d9af4f commit 625efb4

2 files changed

Lines changed: 11 additions & 41 deletions

File tree

eng/common/testproxy/test-proxy-docker.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

eng/common/testproxy/test-proxy-tool.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,17 @@ steps:
2222
pwsh: true
2323

2424
- pwsh: |
25-
$version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
25+
$standardVersion = "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt"
26+
$overrideVersion = "${{ parameters.templateRoot }}/eng/target_proxy_version.txt"
27+
28+
$version = $(Get-Content $standardVersion -Raw).Trim()
29+
30+
if (Test-Path $overrideVersion) {
31+
$version = $(Get-Content $overrideVersion -Raw).Trim()
32+
}
33+
34+
Write-Host "Installing test-proxy version $version"
35+
2636
dotnet tool install azure.sdk.tools.testproxy `
2737
--tool-path $(Build.BinariesDirectory)/test-proxy `
2838
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `

0 commit comments

Comments
 (0)