actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-24 10:28:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into al-cheb/use-setup-ruby-logic

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-18 12:40:07 +03:00
committed by GitHub
parent 69370b14c4 576a03e343
commit 8445f55d50
44 changed files with 484 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/win/scripts/Installers/Install-DotnetSDK.ps1
View File

@@ -55,24 +55,19 @@ function InstallSDKVersion (
function InstallAllValidSdks()
{
$releaseIndexName = "releases-index.json"
$releaseIndexUrl = "https://raw.githubusercontent.com/dotnet/core/master/release-notes/${releaseIndexName}"
$releasesIndexPath = Start-DownloadWithRetry -Url $releaseIndexUrl -Name $releaseIndexName
$dotnetChannels = Get-Content -Path $releasesIndexPath | ConvertFrom-Json
# Consider all channels except preview/eol channels.
# Sort the channels in ascending order
$dotnetChannels = $dotnetChannels.'releases-index' | Where-Object { (!$_."support-phase".Equals('preview') -and !$_."support-phase".Equals('eol') -and !$_."support-phase".Equals('rc')) } | Sort-Object { [Version] $_."channel-version" }
$dotnetVersions = (Get-ToolsetContent).dotnet.versions
# Download installation script.
$installationName = "dotnet-install.ps1"
$installationUrl = "https://dot.net/v1/${installationName}"
Start-DownloadWithRetry -Url $installationUrl -Name $installationName -DownloadPath ".\"
ForEach ($dotnetChannel in $dotnetChannels)
ForEach ($dotnetVersion in $dotnetVersions)
{
$channelVersion = $dotnetChannel.'channel-version';
$releasesJsonPath = Start-DownloadWithRetry -Url $dotnetChannel.'releases.json' -Name "releases-$channelVersion.json"
$releaseJson = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${dotnetVersion}/releases.json"
$releasesJsonPath = Start-DownloadWithRetry -Url $releaseJson -Name "releases-${dotnetVersion}.json"
$currentReleases = Get-Content -Path $releasesJsonPath | ConvertFrom-Json
# filtering out the preview/rc releases
$currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } | Sort-Object { [Version] $_.'release-version' }

9
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -10,13 +10,6 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -Disa
$markdown = ""
if ($env:ANNOUNCEMENTS) {
$markdown += $env:ANNOUNCEMENTS
$markdown += New-MDNewLine
$markdown += "***"
$markdown += New-MDNewLine
}
$OSName = Get-OSName
$markdown += New-MDHeader "$OSName" -Level 1
@@ -30,7 +23,7 @@ if (Test-IsWin19)
{
$markdown += New-MDHeader "Enabled windows optional features" -Level 2
$markdown += New-MDList -Style Unordered -Lines @(
"Windows Subsystem for Linux"
"Windows Subsystem for Linux [WSLv1]"
)
}

4
images/win/scripts/Tests/DotnetSDK.Tests.ps1
View File

@@ -1,6 +1,4 @@
$releaseIndexUrl = "https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json"
$dotnetChannels = (New-Object system.net.webclient).DownloadString($releaseIndexUrl) | ConvertFrom-Json
$dotnetVersions = $dotnetChannels.'releases-index' | Where-Object { (!$_."support-phase".Equals('preview') -and !$_."support-phase".Equals('eol') -and !$_."support-phase".Equals('rc')) } | Select-Object -ExpandProperty "channel-version"
$dotnetVersions = (Get-ToolsetContent).dotnet.versions
Describe "Dotnet SDK" {