diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ab2cde8e4..67cd528fc 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -75,6 +75,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( $markdown += New-MDHeader "Tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-7zipVersion), + (Get-Aria2Version), (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c49374ea5..a9ccfb8e5 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,3 +1,9 @@ +function Get-Aria2Version { + (aria2c -v | Out-String) -match "(?(\d+\.){1,}\d+)" | Out-Null + $aria2Version = $Matches.Version + return "aria2 $aria2Version" +} + function Get-AzCosmosDBEmulatorVersion { $regKey = gci HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\* | gp | ? { $_.DisplayName -eq 'Azure Cosmos DB Emulator' } $installDir = $regKey.InstallLocation @@ -274,4 +280,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} \ No newline at end of file +} diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 965f114f8..1fb602acd 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -4,6 +4,12 @@ Describe "7-Zip" { } } +Describe "Aria2" { + It "Aria2" { + "aria2c --version" | Should -ReturnZeroExitCode + } +} + Describe "AzCopy" { It "AzCopy" { "azcopy --version" | Should -ReturnZeroExitCode @@ -104,4 +110,4 @@ Describe "Kotlin" { It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index fd31857fd..b4f0ebe9a 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -375,6 +375,7 @@ "choco": { "common_packages": [ { "name": "7zip.install" }, + { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "gitversion.portable" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1708e7f0f..9f158ec97 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -401,6 +401,7 @@ "choco": { "common_packages": [ { "name": "7zip.install" }, + { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "gitversion.portable" },