Update scripts to compensate for installer->sdk migration (#5488)

This commit is contained in:
Matt Thalman 2024-05-22 13:16:15 -05:00 коммит произвёл Logan Bussell
Родитель f62d9e4992
Коммит 19573ff901
4 изменённых файлов: 23 добавлений и 15 удалений

Просмотреть файл

@ -106,19 +106,27 @@ function ResolveSdkUrl([string]$sdkVersion, [string]$queryString, [bool]$useStab
return $sdkUrl
}
function GetVersionDetails([string]$commitSha) {
function GetVersionDetails([string]$commitSha, [string]$dockerfileVersion) {
$versionDetailsPath="eng/Version.Details.xml"
if ($UseInternalBuild) {
$dotnetInstallerRepoId="c20f712b-f093-40de-9013-d6b084c1ff30"
$versionDetailsUrl="https://dev.azure.com/dnceng/internal/_apis/git/repositories/$dotnetInstallerRepoId/items?scopePath=/$versionDetailsPath&api-version=6.0&version=$commitSha&versionType=commit"
if (([Version]$dockerfileVersion).Major -le 8) {
$repoName = "installer"
$repoId = "c20f712b-f093-40de-9013-d6b084c1ff30"
}
else {
$repoName = "sdk"
$repoId = "7fa5dddb-89e8-4b26-8595-a6d15593e354"
}
if ($UseInternalBuild) {
$versionDetailsUrl="https://dev.azure.com/dnceng/internal/_apis/git/repositories/$repoId/items?scopePath=/$versionDetailsPath&api-version=6.0&version=$commitSha&versionType=commit"
$base64AccessToken = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzdoVersionsRepoInfoAccessToken"))
$headers = @{
"Authorization" = "Basic $base64AccessToken"
}
}
else {
$versionDetailsUrl="https://raw.githubusercontent.com/dotnet/installer/$commitSha/$versionDetailsPath"
$versionDetailsUrl="https://raw.githubusercontent.com/dotnet/$repoName/$commitSha/$versionDetailsPath"
$headers = @{}
}
@ -171,7 +179,10 @@ foreach ($sdkVersion in $SdkVersions)
Write-Host "Resolved SDK versions: $SdkVersions"
$versionInfos = @()
foreach ($sdkVersionInfo in $SdkVersionInfos) {
$versionDetails = GetVersionDetails $sdkVersionInfo.CommitSha
$sdkVersionParts = $sdkVersionInfo.Version -split "\."
$dockerfileVersion = "$($sdkVersionParts[0]).$($sdkVersionParts[1])"
$versionDetails = GetVersionDetails $sdkVersionInfo.CommitSha $dockerfileVersion
$runtimeVersion = GetDependencyVersion "VS.Redist.Common.NetCore.SharedFramework.x64" $versionDetails
@ -187,9 +198,6 @@ foreach ($sdkVersionInfo in $SdkVersionInfos) {
exit 1
}
$sdkVersionParts = $sdkVersionInfo.Version -split "\."
$dockerfileVersion = "$($sdkVersionParts[0]).$($sdkVersionParts[1])"
Write-Host "Dockerfile version: $dockerfileVersion"
Write-Host "SDK version: $($sdkVersionInfo.Version)"
Write-Host "Runtime version: $runtimeVersion"

Просмотреть файл

@ -12,17 +12,17 @@ param(
$ProductVersion,
# Build version of the SDK
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetInstaller')]
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetSdk')]
[string]
$SdkVersion,
# Build version of ASP.NET Core
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetInstaller')]
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetSdk')]
[string]
$AspnetVersion,
# Build version of the .NET runtime
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetInstaller')]
[Parameter(Mandatory = $false, ParameterSetName = 'DotnetSdk')]
[string]
$RuntimeVersion,
@ -114,7 +114,7 @@ if ($UseStableBranding) {
}
$versionSourceName = switch ($PSCmdlet.ParameterSetName) {
"DotnetInstaller" { "dotnet/installer" }
"DotnetSdk" { "dotnet/sdk" }
"DotnetMonitor" { "dotnet/dotnet-monitor/$ProductVersion" }
"DotnetAspireDashboard" { "dotnet/aspire-dashboard/$ProductVersion" }
default { Write-Error -Message "Unknown version source" -ErrorAction Stop }

Просмотреть файл

@ -9,7 +9,7 @@ stages:
- stage: DotNet
jobs:
- job: UpdateDependencies
displayName: Update Dependencies (dotnet/installer)
displayName: Update Dependencies (dotnet/sdk)
pool:
vmImage: $(defaultLinuxAmd64PoolImage)
steps:

Просмотреть файл

@ -13,7 +13,7 @@ stages:
- stage: DotNet
jobs:
- job: UpdateDependencies
displayName: Update Dependencies (dotnet/installer)
displayName: Update Dependencies (dotnet/sdk)
pool:
vmImage: $(defaultLinuxAmd64PoolImage)
steps: