From 207f49ed9343b65a01c0750a2e552d05a3bd985b Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Thu, 24 Sep 2020 13:01:25 +0300
Subject: [PATCH] add g++-10

---
 .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 6 +++---
 images/linux/scripts/installers/gcc.sh                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 64a9d1c3f..267dcac3a 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -8,7 +8,7 @@ function Get-CPPVersions {
     $cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object {
         $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null
         $Matches.version
-    }
+    } | Sort-Object {[Version]$_}
     return "GNU C++ " + ($cppVersions -Join ", ")
 }
 
@@ -16,7 +16,7 @@ function Get-FortranVersions {
     $fortranVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object {
         $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null
         $Matches.version
-    }
+    } | Sort-Object {[Version]$_}
     return "GNU Fortran " + ($fortranVersions -Join ", ")
 }
 
@@ -28,7 +28,7 @@ function Get-ClangVersions {
             $_ -match "clang version (?<version>\d+\.\d+\.\d+)-" | Out-Null
             $Matches.version
         }
-    }
+    } | Sort-Object {[Version]$_}
     return "Clang " + ($clangVersions -Join ", ")
 }
 
diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh
index 7b1bd56ea..914c3e1e0 100644
--- a/images/linux/scripts/installers/gcc.sh
+++ b/images/linux/scripts/installers/gcc.sh
@@ -4,7 +4,6 @@
 ##  Desc:  Installs GNU C++
 ################################################################################
 
-
 function InstallGcc {
     version=$1
 
@@ -27,6 +26,7 @@ versions=(
     "g++-7"
     "g++-8"
     "g++-9"
+    "g++-10"
 )
 
 for version in ${versions[*]}