From 5a82b10fc782ec272959cd59b0638765d81ceb2b Mon Sep 17 00:00:00 2001
From: Chunqing Chen <cchen@microsoft.com>
Date: Mon, 1 May 2017 13:54:01 -0700
Subject: [PATCH] Get-Help should find help files under pshome (#3528)

---
 .../help/HelpProvider.cs                      | 16 +++---------
 .../engine/Help/HelpSystem.Tests.ps1          | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/System.Management.Automation/help/HelpProvider.cs b/src/System.Management.Automation/help/HelpProvider.cs
index aeaef1c636..3460834874 100644
--- a/src/System.Management.Automation/help/HelpProvider.cs
+++ b/src/System.Management.Automation/help/HelpProvider.cs
@@ -222,30 +222,20 @@ namespace System.Management.Automation
 
         /// <summary>
         /// Each Shell ( minishell ) will have its own path specified by the
-        /// registry HKLM\software\microsoft\msh\1\ShellIds\&lt;ShellID&gt;\path. Every help
-        /// provider should search this path for content.
+        /// application base folder, which should be the same as $pshome
         /// </summary>
         /// <returns>string representing base directory of the executing shell.</returns>
         internal string GetDefaultShellSearchPath()
         {
             string shellID = this.HelpSystem.ExecutionContext.ShellID;
-            string returnValue = CommandDiscovery.GetShellPathFromRegistry(shellID);
+            // Beginning in PowerShell 6.0.0.12, the $pshome is no longer registry specified, we search the application base instead.
+            string returnValue = Utils.GetApplicationBase(shellID);
 
             if (returnValue == null)
             {
                 // use executing assemblies location in case registry entry not found
                 returnValue = Path.GetDirectoryName(PsUtils.GetMainModule(System.Diagnostics.Process.GetCurrentProcess()).FileName);
             }
-            else
-            {
-                // Get the directory path of the executing shell
-                returnValue = Path.GetDirectoryName(returnValue);
-                if (!Directory.Exists(returnValue))
-                {
-                    // use executing assemblies location in case registry entry not found
-                    returnValue = Path.GetDirectoryName(PsUtils.GetMainModule(System.Diagnostics.Process.GetCurrentProcess()).FileName);
-                }
-            }
 
             return returnValue;
         }
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 51eb2acc26..2181da4db2 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -201,3 +201,28 @@ Describe "Validate about_help.txt under culture specific folder works" -Tags @('
         $help | Should BeExactly "Hello"
     }
 }
+
+Describe "Get-Help should find help info within help files" -Tags @('CI', 'RequireAdminOnWindows') {
+    It "Get-Help should find help files under pshome" {
+        $helpFile = "about_testCase.help.txt"
+        $culture = (Get-Culture).Name
+        $helpFolderPath = Join-Path $PSHOME $culture
+        $helpFilePath = Join-Path $helpFolderPath $helpFile
+
+        if (!(Test-Path $helpFolderPath))
+        {
+            $null = New-Item -ItemType Directory -Path $helpFolderPath -ErrorAction SilentlyContinue
+        }
+        
+        try
+        {
+            $null = New-Item -ItemType File -Path $helpFilePath -Value "about_test" -ErrorAction SilentlyContinue
+            $helpContent = Get-Help about_testCase
+            $helpContent | Should Match "about_test"
+        }
+        finally
+        {
+            Remove-Item $helpFilePath -Force -ErrorAction SilentlyContinue
+        }
+    }
+}