Merge branch 'main' of https://github.com/actions/virtual-environments into main

images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1

@@ -31,7 +31,6 @@ function Get-AndroidInstalledPackages {
     return $androidInstalledPackages
 }
 
-
 function Build-AndroidTable {
     $packageInfo = Get-AndroidInstalledPackages
     return @(

images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1

@@ -1,5 +1,3 @@
-$ErrorActionPreference = "Stop"
-
 Import-Module MarkdownPS
 Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking
 Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking
@@ -74,7 +72,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
 
 $markdown += New-MDHeader "Tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines @(
-    (Get-AzCosmosDBEmulatorVersion),
     (Get-AzCopyVersion),
     (Get-BazelVersion),
     (Get-BazeliskVersion),
@@ -91,15 +88,12 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-KubectlVersion),
     (Get-KindVersion),
     (Get-MinGWVersion),
-    (Get-MySQLVersion),
     (Get-MercurialVersion),
     (Get-NSISVersion),
     (Get-NewmanVersion),
     (Get-OpenSSLVersion),
     (Get-PackerVersion),
     (Get-PulumiVersion),
-    (Get-SQLPSVersion),
-    (Get-SQLServerPSVersion),
     (Get-SVNVersion),
     (Get-GHCVersion),
     (Get-CabalVersion),
@@ -176,6 +170,15 @@ $markdown += New-MDHeader "Databases" -Level 3
 $markdown += Build-DatabasesMarkdown
 $markdown += New-MDNewLine
 
+$markdown += New-MDHeader "Database tools" -Level 3
+$markdown += New-MDList -Style Unordered -Lines @(
+    (Get-AzCosmosDBEmulatorVersion),
+    (Get-DacFxVersion),
+    (Get-SQLPSVersion),
+    (Get-MySQLVersion)
+)
+$markdown += New-MDNewLine
+
 $vs = Get-VisualStudioVersion
 $markdown += New-MDHeader "$($vs.Name)" -Level 3
 $markdown += $vs | New-MDTable
@@ -238,4 +241,8 @@ $markdown += New-MDHeader "Android" -Level 3
 $markdown += Build-AndroidTable | New-MDTable
 $markdown += New-MDNewLine
 
+# Docker images section
+$markdown += New-MDHeader "Cached Docker images" -Level 3
+$markdown += New-MDList -Style Unordered -Lines @(Get-CachedDockerImages)
+
 $markdown | Out-File -FilePath "C:\InstalledSoftware.md"

images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1

@@ -125,12 +125,6 @@ function Get-SQLPSVersion {
     return "SQLPS $version"
 }
 
-function Get-SQLServerPSVersion {
-    $module = Get-Module -Name SQLServer -ListAvailable
-    $version = $module.Version
-    return "SQLServer PS $version"
-}
-
 function Get-SVNVersion {
     $svnVersion = $(svn --version --quiet)
     return "Subversion (SVN) $svnVersion"
@@ -260,3 +254,9 @@ function Get-AZDSVersion {
     $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)"
     return "Azure Dev Spaces CLI $azdsVersion"
 }
+
+function Get-DacFxVersion {
+    cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\"
+    $dacfxversion = (./sqlpackage.exe /version)
+    return "DacFx $dacfxversion"
+}