From d6a56c8bedf6ea021842cc33efba7e1cded3eaad Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Tue, 16 Sep 2025 13:15:22 -0700
Subject: [PATCH 1/2] Pull publish data from current branch

---
 azure-pipelines-official.yml      |  2 +-
 azure-pipelines-pr-validation.yml |  2 +-
 eng/build-utils.ps1               | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 82e2ac735bcbc..be3c8259b7e80 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -369,7 +369,7 @@ extends:
             componentPassword: $(dn-bot-dnceng-build-e-code-full-release-e-packaging-r)
             componentBuildProjectName: internal
             sourceBranch: "$(ComponentBranchName)"
-            publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
+            publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&version=$(ComponentBranchName)&api-version=6.0"
             publishDataAccessToken: "$(System.AccessToken)"
             dropPath: '$(Pipeline.Workspace)\VSSetup'
 
diff --git a/azure-pipelines-pr-validation.yml b/azure-pipelines-pr-validation.yml
index d918f22289781..5a4fb94be0170 100644
--- a/azure-pipelines-pr-validation.yml
+++ b/azure-pipelines-pr-validation.yml
@@ -274,6 +274,6 @@ stages:
         vsBranchName: ${{ parameters.VisualStudioBranchName }}
         titlePrefix: ${{ parameters.OptionalTitlePrefix }}
         sourceBranch: $(SourceBranchName)
-        publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
+        publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/$(SourceBranchName)/eng/config/PublishData.json"
         queueSpeedometerValidation: true
 
diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
index 64dd3a3d343f4..369e7439f244f 100644
--- a/eng/build-utils.ps1
+++ b/eng/build-utils.ps1
@@ -8,7 +8,6 @@ $ErrorActionPreference="Stop"
 
 $VSSetupDir = Join-Path $ArtifactsDir "VSSetup\$configuration"
 $PackagesDir = Join-Path $ArtifactsDir "packages\$configuration"
-$PublishDataUrl = "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
 
 $binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $false }
 $nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { $false }
@@ -22,19 +21,21 @@ function GetProjectOutputBinary([string]$fileName, [string]$projectName = "", [s
   return Join-Path $ArtifactsDir "bin\$projectName\$configuration\$tfm\$ridDir$publishDir$fileName"
 }
 
-function GetPublishData() {
+function GetPublishData([string]$branchName) {
   if (Test-Path variable:global:_PublishData) {
     return $global:_PublishData
   }
 
-  Write-Host "Downloading $PublishDataUrl"
-  $content = (Invoke-WebRequest -Uri $PublishDataUrl -UseBasicParsing).Content
+  $publishDataFile = Join-Path $PSScriptRoot "config\PublishData.json"
+
+  Write-Host "Reading $publishDataFile"
+  $content = Get-Content -Path $publishDataFile -Raw
 
   return $global:_PublishData = ConvertFrom-Json $content
 }
 
 function GetBranchPublishData([string]$branchName) {
-  $data = GetPublishData
+  $data = GetPublishData $branchName
 
   if (Get-Member -InputObject $data.branches -Name $branchName) {
     return $data.branches.$branchName

From 93e8c388dc7731c1841d3795034192645dac4bda Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Wed, 17 Sep 2025 10:33:54 -0700
Subject: [PATCH 2/2] delete unused param

---
 eng/build-utils.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
index 369e7439f244f..ba679ba8beb9e 100644
--- a/eng/build-utils.ps1
+++ b/eng/build-utils.ps1
@@ -21,7 +21,7 @@ function GetProjectOutputBinary([string]$fileName, [string]$projectName = "", [s
   return Join-Path $ArtifactsDir "bin\$projectName\$configuration\$tfm\$ridDir$publishDir$fileName"
 }
 
-function GetPublishData([string]$branchName) {
+function GetPublishData() {
   if (Test-Path variable:global:_PublishData) {
     return $global:_PublishData
   }
@@ -35,7 +35,7 @@ function GetPublishData([string]$branchName) {
 }
 
 function GetBranchPublishData([string]$branchName) {
-  $data = GetPublishData $branchName
+  $data = GetPublishData
 
   if (Get-Member -InputObject $data.branches -Name $branchName) {
     return $data.branches.$branchName