From 70219fe6eeeab5e80724f9a6c8e2b10f6f9eea3b Mon Sep 17 00:00:00 2001
From: Leonid Lapshin <v-llapshin@microsoft.com>
Date: Mon, 5 Oct 2020 16:24:53 +0300
Subject: [PATCH] Add database tools section to Windows docs (#1706)

* add database tools section to docs, removed sqlps powershell module

* reverted SQLPS module changes

* removed SqlServer module from tools, its listed in PS modules

* delete function as its not needed

Co-authored-by: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
---
 .../SoftwareReport/SoftwareReport.Generator.ps1      | 12 ++++++++----
 .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 |  6 ------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 377331ada..c9f170309 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -74,7 +74,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
 
 $markdown += New-MDHeader "Tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines @(
-    (Get-AzCosmosDBEmulatorVersion),
     (Get-AzCopyVersion),
     (Get-BazelVersion),
     (Get-BazeliskVersion),
@@ -91,15 +90,12 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-KubectlVersion),
     (Get-KindVersion),
     (Get-MinGWVersion),
-    (Get-MySQLVersion),
     (Get-MercurialVersion),
     (Get-NSISVersion),
     (Get-NewmanVersion),
     (Get-OpenSSLVersion),
     (Get-PackerVersion),
     (Get-PulumiVersion),
-    (Get-SQLPSVersion),
-    (Get-SQLServerPSVersion),
     (Get-SVNVersion),
     (Get-GHCVersion),
     (Get-CabalVersion),
@@ -168,6 +164,14 @@ $markdown += New-MDHeader "Databases" -Level 3
 $markdown += Build-DatabasesMarkdown
 $markdown += New-MDNewLine
 
+$markdown += New-MDHeader "Database tools" -Level 3
+$markdown += New-MDList -Style Unordered -Lines @(
+    (Get-AzCosmosDBEmulatorVersion),
+    (Get-SQLPSVersion),
+    (Get-MySQLVersion)
+)
+$markdown += New-MDNewLine
+
 $vs = Get-VisualStudioVersion
 $markdown += New-MDHeader "$($vs.Name)" -Level 3
 $markdown += $vs | New-MDTable
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index 0c0f39f55..6c4034871 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -125,12 +125,6 @@ function Get-SQLPSVersion {
     return "SQLPS $version"
 }
 
-function Get-SQLServerPSVersion {
-    $module = Get-Module -Name SQLServer -ListAvailable
-    $version = $module.Version
-    return "SQLServer PS $version"
-}
-
 function Get-SVNVersion {
     $svnVersion = $(svn --version --quiet)
     return "Subversion (SVN) $svnVersion"