diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 69537a43..280b9c95 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 c3538d70..763a158e 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\ " -TestCases @( @{ PathTest = "python.exe" } @{ PathTest = "Scripts\conda.exe" } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 334e4b7e..90c1dbaf 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",