maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make changes to take RC branch SDK

Browse source
This commit is contained in:
Aditya Patwardhan 2021-09-02 10:24:47 -07:00
parent d3d8897619
commit dd6ef97685
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/daily.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
Write-Verbose "OLD_VERSION=$currentVersion" -Verbose
"OLD_VERSION=$currentVersion" | Out-File $env:GITHUB_ENV -Append
./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging
./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
$newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
Write-Verbose "NEW_VERSION=$newVersion" -Verbose
"NEW_VERSION=$newVersion" | Out-File $env:GITHUB_ENV -Append

18
tools/UpdateDotnetRuntime.ps1
View file

@ -187,17 +187,23 @@ function Get-DotnetUpdate {
try {
$latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
$selectedQuality = $quality
try {
$latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
$selectedQuality = $quality
} catch {
if ($_.exception.Response.StatusCode -eq 'NotFound') {
Write-Verbose "Build not found for Channel: $Channel and Quality: $Quality" -Verbose
} else {
throw $_
}
}
if (-not $latestSDKVersionString.StartsWith($sdkImageVersion))
{
if (-not $latestSDKVersionString -or -not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
# we did not get a version number so fall back to daily
$latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$qualityFallback/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
$selectedQuality = $qualityFallback
if (-not $latestSDKVersionString.StartsWith($sdkImageVersion))
{
if (-not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
throw "No build found!"
}
}