From e5e8cc59dd946939f2fe61ddd8bba152aa12f2f7 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Thu, 11 Nov 2021 15:27:09 +0300
Subject: [PATCH] Add miniconda to windows 2022 image (#4467)

---
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1    | 7 +------
 images/win/scripts/Tests/Miniconda.Tests.ps1               | 4 ++--
 images/win/windows2022.json                                | 1 +
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 69537a437..280b9c95e 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -51,6 +51,7 @@ $markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object)
 
 $packageManagementList = @(
     (Get-ChocoVersion),
+    (Get-CondaVersion),
     (Get-ComposerVersion),
     (Get-HelmVersion),
     (Get-NPMVersion),
@@ -62,12 +63,6 @@ $packageManagementList = @(
     (Get-YarnVersion)
 )
 
-if ((Test-IsWin16) -or (Test-IsWin19)) {
-    $packageManagementList += @(
-        (Get-CondaVersion)
-    )
-}
-
 $markdown += New-MDHeader "Package Management" -Level 3
 $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object)
 
diff --git a/images/win/scripts/Tests/Miniconda.Tests.ps1 b/images/win/scripts/Tests/Miniconda.Tests.ps1
index c3538d70e..763a158e2 100644
--- a/images/win/scripts/Tests/Miniconda.Tests.ps1
+++ b/images/win/scripts/Tests/Miniconda.Tests.ps1
@@ -1,8 +1,8 @@
-Describe "Miniconda" -Skip:(Test-IsWin22) {
+Describe "Miniconda" {
     It "Miniconda Environment variables is set. " {
         ${env:CONDA} | Should -Not -BeNullOrEmpty
     }
-    
+
     It "Miniconda $env:CONDA\<PathTest> " -TestCases @(
         @{ PathTest = "python.exe" }
         @{ PathTest = "Scripts\conda.exe" }
diff --git a/images/win/windows2022.json b/images/win/windows2022.json
index 334e4b7e4..90c1dbaf6 100644
--- a/images/win/windows2022.json
+++ b/images/win/windows2022.json
@@ -221,6 +221,7 @@
                 "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Stack.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1",