From 92a49b76a9acb67d0015908fec77b2718d2f4840 Mon Sep 17 00:00:00 2001
From: Scott Beddall <scbedd@microsoft.com>
Date: Fri, 28 Jul 2023 13:10:47 -0700
Subject: [PATCH] breadcrumb file doesn't exist anymore, but we can use an
 existing proxy feature to get the same performance

---
 .../README.md => onboarding/README.me}              |  0
 .../generate-assets-json.ps1                        | 13 ++++++-------
 eng/common/testproxy/target_version.txt             |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename eng/common/testproxy/{transition-scripts/README.md => onboarding/README.me} (100%)
 rename eng/common/testproxy/{transition-scripts => onboarding}/generate-assets-json.ps1 (97%)

diff --git a/eng/common/testproxy/transition-scripts/README.md b/eng/common/testproxy/onboarding/README.me
similarity index 100%
rename from eng/common/testproxy/transition-scripts/README.md
rename to eng/common/testproxy/onboarding/README.me
diff --git a/eng/common/testproxy/transition-scripts/generate-assets-json.ps1 b/eng/common/testproxy/onboarding/generate-assets-json.ps1
similarity index 97%
rename from eng/common/testproxy/transition-scripts/generate-assets-json.ps1
rename to eng/common/testproxy/onboarding/generate-assets-json.ps1
index 7ecd8408af01..3011a19e57aa 100644
--- a/eng/common/testproxy/transition-scripts/generate-assets-json.ps1
+++ b/eng/common/testproxy/onboarding/generate-assets-json.ps1
@@ -308,18 +308,17 @@ Function Invoke-ProxyCommand {
 # Get the shorthash directory under PROXY_ASSETS_FOLDER
 Function Get-AssetsRoot {
   param(
-    [string] $AssetsJsonFile
+    [string] $AssetsJsonFile,
+    [string] $TestProxyExe
   )
   $repoRoot = Get-Repo-Root
   $relPath = [IO.Path]::GetRelativePath($repoRoot, $AssetsJsonFile).Replace("`\", "/")
   $assetsJsonDirectory = Split-Path $relPath
-  $breadcrumbFile = Join-Path $repoRoot ".assets" ".breadcrumb"
 
-  $breadcrumbString = Get-Content $breadcrumbFile | Where-Object { $_.StartsWith($relPath) }
-  $assetRepo = $breadcrumbString.Split(";")[1]
-  $assetsPrefix = (Get-Content $AssetsJsonFile | Out-String | ConvertFrom-Json).AssetsRepoPrefixPath
+  [array] $output = & "$TestProxyExe" config locate -a "$relPath" --storage-location="$repoRoot"
+  $assetsDirectory = $output[-1]
 
-  return Join-Path $repoRoot ".assets" $assetRepo $assetsPrefix $assetsJsonDirectory
+  return Join-Path $assetsDirectory $assetsJsonDirectory
 }
 
 Function Move-AssetsFromLangRepo {
@@ -405,7 +404,7 @@ if ($InitialPush) {
     $CommandArgs = "restore --assets-json-path $assetsJsonRelPath"
     Invoke-ProxyCommand -TestProxyExe $TestProxyExe -CommandArgs $CommandArgs -TargetDirectory $repoRoot
 
-    $assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile)
+    $assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile -TestProxyExe $TestProxyExe)
     Write-Host "assetsRoot=$assetsRoot"
 
     Move-AssetsFromLangRepo -AssetsRoot $assetsRoot
diff --git a/eng/common/testproxy/target_version.txt b/eng/common/testproxy/target_version.txt
index 29b6ba9ec822..faaab72a41d3 100644
--- a/eng/common/testproxy/target_version.txt
+++ b/eng/common/testproxy/target_version.txt
@@ -1 +1 @@
-1.0.0-dev.20230721.1
+1.0.0-dev.20230728.1