Merge branch 'main' into v-dmshib/add-python3.9-win

.gitattributes

@@ -1,2 +1 @@
-# Do not normalize line endings
-*       -text
+*   text=auto eol=lf

images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1

@@ -248,5 +248,6 @@ function Get-AptPackages {
 }
 
 function Get-PipxVersion {
-    return "Pipx $(pipx --version 2> $null)"
+    $result = (Get-CommandResult "pipx --version").Output
+    return "Pipx $result"
 }

images/macos/provision/core/edge.sh

@@ -1,7 +1,11 @@
 source ~/utils/utils.sh
 
 echo "Installing Microsoft Edge..."
+# Workaround to install version 85 since webdriver is broken for 86
+cd "$(brew --repo homebrew/homebrew-cask)"
+git checkout 81f9d08d2b9b7557c0178621078cf59d2c5db2bc
 brew cask install microsoft-edge
+git checkout master
 
 EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
 EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)

images/win/Windows2019-Readme.md

@@ -523,5 +523,3 @@ All other versions are saved but not installed.
 -  mcr.microsoft.com/windows/servercore:ltsc2019
 -  mcr.microsoft.com/windows/nanoserver:1809
 -  microsoft/aspnetcore-build:1.0-2.0
-
-

images/win/scripts/Installers/Install-Haskell.ps1

@@ -4,7 +4,7 @@
 ################################################################################
 
 # Get 3 latest versions of GHC
-[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions --limit-output | Where-Object { $_.StartsWith("ghc|") } | ForEach-Object { $_.TrimStart("ghc|") }
+[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith("ghc ") -and $_ -match "Approved"} | ForEach-Object { [regex]::matches($_, "\d+(\.\d+){2,}").value }
 $MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3
 $VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object