mirror of
https://github.com/actions/runner-images.git
synced 2025-12-13 20:56:47 +00:00
Refactor Get-DotnetFrameworkTools and allow multiple SDKs installation (#5464)
This commit is contained in:
@@ -226,14 +226,13 @@ function Get-DotnetRuntimes {
|
||||
|
||||
function Get-DotnetFrameworkTools {
|
||||
$path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX*"
|
||||
$frameworkVersions = @()
|
||||
Get-ChildItem -Path $path -Directory | ForEach-Object {
|
||||
$frameworkVersions += ($_.Name -Split(" "))[1]
|
||||
$frameworkPath = $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>"
|
||||
}
|
||||
Get-ChildItem -Path $path -Directory | Group-Object {
|
||||
$_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>"
|
||||
} | ForEach-Object {
|
||||
[PSCustomObject]@{
|
||||
Versions = $frameworkVersions -Join " "
|
||||
Path = $frameworkPath
|
||||
Versions = $_.Group.Name | ForEach-Object { $_.Split(" ")[1] }
|
||||
Path = $_.Name
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -267,12 +267,15 @@ Get-DotnetRuntimes | Foreach-Object {
|
||||
}
|
||||
|
||||
$markdown += New-MDHeader ".NET Framework" -Level 3
|
||||
$frameworks = Get-DotnetFrameworkTools
|
||||
$markdown += "``Type: Developer Pack``"
|
||||
$markdown += New-MDNewLine
|
||||
$markdown += "``Location $($frameworks.Path)``"
|
||||
Get-DotnetFrameworkTools | Foreach-Object {
|
||||
$path = $_.Path
|
||||
$versions = $_.Versions
|
||||
$markdown += "``Location: $path``"
|
||||
$markdown += New-MDNewLine
|
||||
$markdown += New-MDList -Lines $frameworks.Versions -Style Unordered
|
||||
$markdown += New-MDList -Lines $versions -Style Unordered
|
||||
}
|
||||
|
||||
$markdown += New-MDHeader ".NET tools" -Level 3
|
||||
$tools = Get-DotnetTools
|
||||
|
||||
@@ -103,8 +103,7 @@ Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) {
|
||||
|
||||
Describe "NET48" {
|
||||
It "NET48" {
|
||||
$netPath = (Get-DotnetFrameworkTools).Path.Split("<")[0]
|
||||
${netPath} + "4.8 Tools" | Should -Exist
|
||||
(Get-DotnetFrameworkTools).Versions | Should -Contain "4.8"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user