actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-13 20:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Get-DotnetFrameworkTools and allow multiple SDKs installation (#5464)

Browse Source
This commit is contained in:
Alexis Saettler
2022-05-11 17:59:46 +02:00
committed by GitHub
parent 63c06b0c58
commit 0ca5e834c0
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -226,15 +226,14 @@ function Get-DotnetRuntimes {
function Get-DotnetFrameworkTools { function Get-DotnetFrameworkTools {
$path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX*" $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX*"
$frameworkVersions = @() Get-ChildItem -Path $path -Directory | Group-Object {
Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>"
$frameworkVersions += ($_.Name -Split(" "))[1] } | ForEach-Object {
$frameworkPath = $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>"
}
[PSCustomObject]@{ [PSCustomObject]@{
Versions = $frameworkVersions -Join " " Versions = $_.Group.Name | ForEach-Object { $_.Split(" ")[1] }
Path = $frameworkPath Path = $_.Name
} }
}
} }
function Get-PowerShellAzureModules { function Get-PowerShellAzureModules {

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

@@ -267,12 +267,15 @@ Get-DotnetRuntimes | Foreach-Object {
} }
$markdown += New-MDHeader ".NET Framework" -Level 3 $markdown += New-MDHeader ".NET Framework" -Level 3
$frameworks = Get-DotnetFrameworkTools
$markdown += "``Type: Developer Pack``" $markdown += "``Type: Developer Pack``"
$markdown += New-MDNewLine $markdown += New-MDNewLine
$markdown += "``Location $($frameworks.Path)``" Get-DotnetFrameworkTools | Foreach-Object {
$markdown += New-MDNewLine $path = $_.Path
$markdown += New-MDList -Lines $frameworks.Versions -Style Unordered $versions = $_.Versions
$markdown += "``Location: $path``"
$markdown += New-MDNewLine
$markdown += New-MDList -Lines $versions -Style Unordered
}
$markdown += New-MDHeader ".NET tools" -Level 3 $markdown += New-MDHeader ".NET tools" -Level 3
$tools = Get-DotnetTools $tools = Get-DotnetTools

3
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -103,8 +103,7 @@ Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) {
Describe "NET48" { Describe "NET48" {
It "NET48" { It "NET48" {
$netPath = (Get-DotnetFrameworkTools).Path.Split("<")[0] (Get-DotnetFrameworkTools).Versions | Should -Contain "4.8"
${netPath} + "4.8 Tools" | Should -Exist
} }
} }