Merge pull request #32869 from dotnet/merges/dev16.0-preview3-to-master

Merge dev16.0-preview3 to master

eng/build.ps1

@@ -282,17 +282,19 @@ function Restore-OptProfData() {
     Exec-Console $dropToolPath "list --dropservice `"$dropServiceUrl`" $patAuth --pathPrefixFilter `"$dropNamePrefix`" --toJsonFile `"$dropsJsonPath`" --traceto `"$logFile`""
     $dropsJson = Get-Content -Raw -Path $dropsJsonPath | ConvertFrom-Json
     
-    # Temporarily hardcoding the drop location to the last good Preview2 drop. The pipeline that generates new new OptProf drops is generating incomplete data.
-    # $latestDrop = find-latest-drop($dropsJson)
-    $latestDrop = "OptimizationData/dotnet/roslyn/master-vs-deps/75e3797e1105a4da4c10dddda76c3b9398f7725a/223453/935479/1"
+    $latestDrop = find-latest-drop($dropsJson)
     
     if ($latestDrop -eq $null) {
         Write-Host "No drop matching given name found: $dropServiceUrl/$dropNamePrefix/*" -ForegroundColor Red 
         ExitWithExitCode 1
     }
+    
+    # Temporarily hardcoding the drop location name to the last good Preview2 drop. The pipeline that generates new new OptProf drops is generating incomplete data.
+    #$latestDropName = $($latestDrop.Name)
+    $latestDropName = "OptimizationData/dotnet/roslyn/master-vs-deps/75e3797e1105a4da4c10dddda76c3b9398f7725a/223453/935479/1"
 
-    Write-Host "Downloading optimization data from service $dropServiceUrl drop $($latestDrop.Name)"
-    Exec-Console $dropToolPath "get --dropservice `"$dropServiceUrl`" $patAuth --name `"$($latestDrop.Name)`" --dest `"$IbcOptimizationDataDir`" --traceto `"$logFile`""
+    Write-Host "Downloading optimization data from service $dropServiceUrl drop $latestDropName"
+    Exec-Console $dropToolPath "get --dropservice `"$dropServiceUrl`" $patAuth --name `"$latestDropName`" --dest `"$IbcOptimizationDataDir`" --traceto `"$logFile`""
 }
 
 function Build-OptProfData() {