Skip to content

Commit 2cfe020

Browse files
authored
[release/dev17.8] Backport publish data to 17.10 (#81236)
Backport of #80333 to release/dev17.8 /cc @JoeRobich @dibarbet
2 parents 4f58abc + d515171 commit 2cfe020

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

azure-pipelines-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ extends:
369369
componentPassword: $(dn-bot-dnceng-build-e-code-full-release-e-packaging-r)
370370
componentBuildProjectName: internal
371371
sourceBranch: "$(ComponentBranchName)"
372-
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
372+
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&version=$(ComponentBranchName)&api-version=6.0"
373373
publishDataAccessToken: "$(System.AccessToken)"
374374
dropPath: '$(Pipeline.Workspace)\VSSetup'
375375
updateXamlRoslynVersion: false

azure-pipelines-pr-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,6 @@ stages:
268268
vsBranchName: ${{ parameters.VisualStudioBranchName }}
269269
titlePrefix: ${{ parameters.OptionalTitlePrefix }}
270270
sourceBranch: $(SourceBranchName)
271-
publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
271+
publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/$(SourceBranchName)/eng/config/PublishData.json"
272272
queueSpeedometerValidation: true
273273

eng/build-utils.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $ErrorActionPreference="Stop"
88

99
$VSSetupDir = Join-Path $ArtifactsDir "VSSetup\$configuration"
1010
$PackagesDir = Join-Path $ArtifactsDir "packages\$configuration"
11-
$PublishDataUrl = "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
1211

1312
$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $false }
1413
$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { $false }
@@ -28,8 +27,10 @@ function GetPublishData() {
2827
return $global:_PublishData
2928
}
3029

31-
Write-Host "Downloading $PublishDataUrl"
32-
$content = (Invoke-WebRequest -Uri $PublishDataUrl -UseBasicParsing).Content
30+
$publishDataFile = Join-Path $PSScriptRoot "config\PublishData.json"
31+
32+
Write-Host "Reading $publishDataFile"
33+
$content = Get-Content -Path $publishDataFile -Raw
3334

3435
return $global:_PublishData = ConvertFrom-Json $content
3536
}

0 commit comments

Comments
 (0)