Merge branch 'main' into myao/syncsb3

# Conflicts: # eng/versioning/version_client.txt # sdk/spring/pipeline/spring-cloud-azure-supported-spring.json # sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml # sdk/spring/spring-cloud-azure-starter-redis/pom.xml # sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml # sdk/storage/azure-storage-blob-stress/pom.xml # sdk/storage/azure-storage-file-datalake-stress/pom.xml # sdk/storage/azure-storage-file-share-stress/pom.xml # sdk/storage/azure-storage-stress/pom.xml
Azure · May 7, 2024 · 7afa801 · 7afa801
2 parents 9c3e766 + 0290770
commit 7afa801
Show file tree

Hide file tree

Showing 144 changed files with 1,622 additions and 1,639 deletions.
diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
@@ -130,25 +130,25 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.8.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
+      <version>4.8.2</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.18.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
+      <version>5.18.3</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.19.2</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
+      <version>1.19.3</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.25.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.25.4</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <dependency>

diff --git a/eng/common/testproxy/test-proxy-docker.yml b/eng/common/testproxy/test-proxy-docker.yml
diff --git a/eng/common/testproxy/test-proxy-tool.yml b/eng/common/testproxy/test-proxy-tool.yml
@@ -22,7 +22,17 @@ steps:
       pwsh: true
 
   - pwsh: |
-      $version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
+      $standardVersion = "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt"
+      $overrideVersion = "${{ parameters.templateRoot }}/eng/target_proxy_version.txt"
+
+      $version = $(Get-Content $standardVersion -Raw).Trim()
+
+      if (Test-Path $overrideVersion) {
+        $version = $(Get-Content $overrideVersion -Raw).Trim()
+      }
+
+      Write-Host "Installing test-proxy version $version"
+
       dotnet tool install azure.sdk.tools.testproxy `
         --tool-path $(Build.BinariesDirectory)/test-proxy `
         --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `