diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 87c94459..b403cd78 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -80,6 +80,7 @@ $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1 $npmVersion = Run-Command "npm --version" $yarnVersion = Run-Command "yarn --version" $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2 +$pipVersion = Get-PipVersion -Version 2 $pip3Version = Get-PipVersion -Version 3 $condaVersion = Invoke-Expression "conda --version" $rubyGemsVersion = Run-Command "gem --version" @@ -90,12 +91,9 @@ if ($os.IsHigherThanMojave) { $vcpkgVersion = Get-VcpkgVersion $markdown += New-MDList -Lines $vcpkgVersion -Style Unordered -NoNewLine } -if ($os.IsLessThanBigSur) { - $pipVersion = Get-PipVersion -Version 2 - $markdown += New-MDList -Style Unordered -Lines @("Pip ${pipVersion}") -NoNewLine -} $markdown += New-MDList -Style Unordered -Lines @( + "Pip ${pipVersion}", "Pip ${pip3Version}", $bundlerVersion, "Carthage ${carthageVersion}", diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 9171eb5b..450c23ec 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -11,7 +11,7 @@ function Get-NativeVersionFormat { return $Version } -Describe "Java" -Skip:($os.IsBigSur) { +Describe "Java" { BeforeAll { function Validate-JavaVersion { param($JavaCommand, $ExpectedVersion) diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 76cd8941..76e5b497 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -12,7 +12,7 @@ Describe "Python" { (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" } - It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) { + It "Python 2 is installed under /usr/local/bin" { Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" } @@ -24,7 +24,7 @@ Describe "Python" { Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" } - It "Pip 2 is available" -Skip:($os.IsBigSur) { + It "Pip 2 is available" { "pip --version" | Should -ReturnZeroExitCode }