Merge branch 'main' into install-codeql-bundle

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

@@ -0,0 +1,10 @@
+################################################################################
+##  File:  Install-AzureDevSpacesCLI.ps1
+##  Desc:  Install Azure Dev Spaces CLI
+################################################################################
+
+# Install Azure Dev Spaces CLI
+Install-Binary -Url "https://aka.ms/get-azds-windows" -Name "Azure Dev Spaces CLI.exe" -ArgumentList ("/quiet")
+Add-MachinePathItem -PathItem "C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI"
+
+Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure Dev Spaces CLI"

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"
+}

images/win/scripts/Tests/CLI.Tools.Tests.ps1

@@ -53,4 +53,10 @@ Describe "Hub CLI" {
     It "hub is installed" {
         "hub --version" | Should -ReturnZeroExitCode
     }
+}
+
+Describe "Azure Dev Spaces CLI" {
+    It "Azure Dev Spaces CLI" {
+        "azds --version" | Should -ReturnZeroExitCode
+    }
 }