From 46fdad5e60e1895f97b10436f35e1ab7202d2efe Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Wed, 16 Sep 2020 10:42:16 +0300
Subject: [PATCH] fix android and docker sections

---
 .../SoftwareReport/SoftwareReport.Android.psm1       | 12 ++++++------
 .../SoftwareReport/SoftwareReport.Generator.ps1      |  2 +-
 .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
index 7f34143a9..a3504171c 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1
@@ -52,6 +52,10 @@ function Build-AndroidTable {
             "Package" = "Google APIs"
             "Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
         },
+        @{
+            "Package" = "NDK"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
+        },
         @{
             "Package" = "Android Support Repository"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"
@@ -71,16 +75,12 @@ function Build-AndroidTable {
         @{
             "Package" = "CMake"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
-        },
-        @{
-            "Package" = "NDK"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
         }
     ) | Where-Object { $_.Version } | ForEach-Object {
         [PSCustomObject] @{
             "Package Name" = $_.Package
             "Version" = $_.Version
-        } 
+        }
     }
 }
 
@@ -109,7 +109,7 @@ function Get-AndroidPlatformVersions {
         $packageInfoParts = Split-TableRowByColumns $_
         $revision = $packageInfoParts[1]
         $version = $packageInfoParts[0].split(";")[1]
-        return "$version, (rev $revision)"
+        return "$version (rev $revision)"
     }
     [array]::Reverse($versions)
     return ($versions -Join "<br>")
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index e0acc6bde..73a8d63e7 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -79,8 +79,8 @@ $toolsList = @(
     (Get-BazeliskVersion),
     (Get-CMakeVersion),
     (Get-CurlVersion),
-    (Get-DockerComposeVersion),
     (Get-DockerMobyVersion),
+    (Get-DockerComposeVersion),
     (Get-DockerBuildxVersion),
     (Get-GitVersion),
     (Get-GitLFSVersion),
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index a76c17f9b..dcb121f61 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -10,12 +10,12 @@ function Get-AnsibleVersion {
 
 function Get-AzCopy7Version {
     $azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
-    return "AzCopy7 (available by azcopy alias) $azcopy7Version"
+    return "AzCopy7 $azcopy7Version (available by ``azcopy`` alias)"
 }
 
 function Get-AzCopy10Version {
     $azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2
-    return "AzCopy10 (available by azcopy10 alias) $azcopy10Version"
+    return "AzCopy10 $azcopy10Version (available by ``azcopy10`` alias)"
 }
 
 function Get-BazelVersion {