From 729b5626f0d974f9731e0f5937e0d2e417f642dc Mon Sep 17 00:00:00 2001
From: daniv-msft <48293037+daniv-msft@users.noreply.github.com>
Date: Wed, 19 May 2021 00:14:16 -0700
Subject: [PATCH] Removing support of Azure Dev Spaces now that it's retired
 (#3413)

---
 .../scripts/Installers/Install-AzureDevSpacesCli.ps1   | 10 ----------
 .../SoftwareReport/SoftwareReport.Generator.ps1        |  1 -
 .../scripts/SoftwareReport/SoftwareReport.Tools.psm1   |  5 -----
 images/win/scripts/Tests/CLI.Tools.Tests.ps1           |  6 ------
 images/win/windows2016.json                            |  1 -
 images/win/windows2019.json                            |  1 -
 6 files changed, 24 deletions(-)
 delete mode 100644 images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1

diff --git a/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 b/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1
deleted file mode 100644
index 5f37fc581b72..000000000000
--- a/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-##  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"
\ No newline at end of file
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 9a66ad7ab5f9..ab477545d43b 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -114,7 +114,6 @@ $markdown += New-MDList -Style Unordered -Lines (@(
     (Get-AWSSAMVersion),
     (Get-AWSSessionManagerVersion),
     (Get-AzureCLIVersion),
-    (Get-AZDSVersion),
     (Get-AzureDevopsExtVersion),
     (Get-CloudFoundryVersion),
     (Get-GHVersion),
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index ec3213421ed9..e8890b8ad58d 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -253,11 +253,6 @@ function Get-VisualCPPComponents {
     }
 }
 
-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)
diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1
index 8079140567a3..d230fcfcddff 100644
--- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1
+++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1
@@ -53,10 +53,4 @@ 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
-    }
 }
\ No newline at end of file
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index f7c6f0493ab2..f6915a84ebf2 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -209,7 +209,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 6f965f92be7c..284b9bf91ff8 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -197,7 +197,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Packer.ps1",