Merge branch 'main' into install-codeql-bundle

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

@@ -113,6 +113,7 @@ $markdown += New-MDHeader "CLI Tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines @(
     (Get-AzureCLIVersion),
     (Get-AzureDevopsExtVersion),
+    (Get-AZDSVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMVersion),
     (Get-AWSSessionManagerVersion),

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

@@ -255,3 +255,8 @@ function Get-VisualCPPComponents {
         }
     }
 }
+
+function Get-AZDSVersion {
+    $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)"
+    return "Azure Dev Spaces CLI $azdsVersion"
+}