From e4b9df8586f04226b5620286aaa8d9392900076a Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 27 Apr 2022 12:40:30 -0700
Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 3238
 (#17755)

* pin proxy version to one that properly sets listenoptions
* targeted proxy repo is incorrect. "testproxy" -> "test-proxy"
* remove override now that the targeted version will work correctly

Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
---
 eng/common/testproxy/docker-start-proxy.ps1  | 2 +-
 eng/common/testproxy/target_version.txt      | 2 +-
 eng/pipelines/templates/steps/build-test.yml | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eng/common/testproxy/docker-start-proxy.ps1 b/eng/common/testproxy/docker-start-proxy.ps1
index c34c9d38d82d..5cdeebf5904a 100644
--- a/eng/common/testproxy/docker-start-proxy.ps1
+++ b/eng/common/testproxy/docker-start-proxy.ps1
@@ -38,7 +38,7 @@ catch {
 
 $SELECTED_IMAGE_TAG = $(Get-Content "$PSScriptRoot/target_version.txt" -Raw).Trim()
 $CONTAINER_NAME = "ambitious_azsdk_test_proxy"
-$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/testproxy:${SELECTED_IMAGE_TAG}"
+$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/test-proxy:${SELECTED_IMAGE_TAG}"
 
 if($VersionOverride) { 
     Write-Host "Overriding default target proxy version of '$SELECTED_IMAGE_TAG' with override $VersionOverride."
diff --git a/eng/common/testproxy/target_version.txt b/eng/common/testproxy/target_version.txt
index a72b151d94e5..86b34733bfcd 100644
--- a/eng/common/testproxy/target_version.txt
+++ b/eng/common/testproxy/target_version.txt
@@ -1 +1 @@
-1.0.0-dev.20220426.1
+1.0.0-dev.20220427.1
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
index b06ca963f800..17dc761ac5e4 100644
--- a/eng/pipelines/templates/steps/build-test.yml
+++ b/eng/pipelines/templates/steps/build-test.yml
@@ -48,9 +48,6 @@ steps:
 
   - ${{ if eq(parameters.TestProxy, true) }}:
     - template: /eng/common/testproxy/test-proxy-tool.yml
-      parameters:
-        targetVersion: '1.0.0-dev.20220224.2'
-
 
   - task: PowerShell@2
     displayName: 'Run Tests'