diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 2a8c4bed1..17ecd1933 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -88,6 +88,11 @@ function Get-MsbuildVersion { return "MSBuild $msbuildVersion (from $msbuildPath)" } +function Get-NuGetVersion { + $nugetVersion = nuget help | Select-Object -First 1 | Take-OutputPart -Part 2 + return "NuGet $nugetVersion" +} + function Get-NodeVersion { $nodeVersion = $(node --version).Substring(1) return "Node $nodeVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 944235327..f2f28588f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -42,6 +42,8 @@ $runtimesList = @( (Get-DashVersion), (Get-CPPVersions), (Get-FortranVersions), + (Get-MsbuildVersion), + (Get-MonoVersion), (Get-NodeVersion), (Get-PerlVersion), (Get-PythonVersion), @@ -56,8 +58,6 @@ $runtimesList = @( if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $runtimesList += @( - (Get-MsbuildVersion), - (Get-MonoVersion), (Get-ErlangVersion), (Get-ErlangRebar3Version), (Get-SwiftVersion) @@ -73,6 +73,7 @@ $packageManagementList = @( (Get-CpanVersion), (Get-GemVersion), (Get-MinicondaVersion), + (Get-NuGetVersion), (Get-HelmVersion), (Get-NpmVersion), (Get-YarnVersion), diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index 120f7ca4c..6a54dc564 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -4,8 +4,15 @@ ## Desc: Installs Mono ################################################################################ +source $HELPER_SCRIPTS/os.sh + LSB_CODENAME=$(lsb_release -cs) +# There are no packages for Ubuntu 22 in the repo, but developers confirmed that packages from Ubuntu 20 should work +if isUbuntu22; then + LSB_CODENAME="focal" +fi + # Test to see if the software in question is already installed, if not install it # wget "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -O out && sudo apt-key add out && rm out diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index a155221e6..13c8d95f9 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -168,7 +168,7 @@ Describe "gfortran" { } } -Describe "Mono" -Skip:(Test-IsUbuntu22) { +Describe "Mono" { It "mono" { "mono --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 96f50fa27..f48257ca5 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -300,6 +300,7 @@ build { "${path.root}/scripts/installers/oc.sh", "${path.root}/scripts/installers/leiningen.sh", "${path.root}/scripts/installers/miniconda.sh", + "${path.root}/scripts/installers/mono.sh", "${path.root}/scripts/installers/kotlin.sh", "${path.root}/scripts/installers/mysql.sh", "${path.root}/scripts/installers/sqlpackage.sh",