Help was incorrectly returning multiple instances of the same help file if it existed under a culture path and the parent was in the search path as well

SteveL-MSFT · SteveL-MSFT · commit 5fdf27f2ae2d · 2017-03-23T19:52:00.000-07:00
diff --git a/src/System.Management.Automation/help/HelpProvider.cs b/src/System.Management.Automation/help/HelpProvider.cs
@@ -273,7 +273,11 @@ internal Collection<string> GetSearchPaths()
             Diagnostics.Assert(searchPaths != null,
                 "HelpSystem returned an null search path");
 
-            searchPaths.Add(GetDefaultShellSearchPath());
+            string defaultShellSearchPath = GetDefaultShellSearchPath();
+            if (!searchPaths.Contains(defaultShellSearchPath))
+            {
+                searchPaths.Add(defaultShellSearchPath);
+            }
 
             return searchPaths;
         }
diff --git a/src/System.Management.Automation/help/MUIFileSearcher.cs b/src/System.Management.Automation/help/MUIFileSearcher.cs
@@ -161,7 +161,7 @@ private void AddFiles(string muiDirectory, string directory, string pattern)
                             string leafFileName = Path.GetFileName(file);
                             string uniqueToDirectory = Path.Combine(directory, leafFileName);
 
-                            if (!_uniqueMatches.Contains(uniqueToDirectory))
+                            if (!_result.Contains(path) && !_uniqueMatches.Contains(uniqueToDirectory))
                             {
                                 _result.Add(path);
                                 _uniqueMatches[uniqueToDirectory] = true;
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -180,3 +180,13 @@ Describe "Validate that Get-Help returns provider-specific help" -Tags @('CI', '
         }
     }
 }
+
+Describe "Validate about_help.txt under culture specific folder works" -Tags @('CI') {
+
+    It "Get-Help about_should should return help text and not multiple HelpInfo objects" {
+
+        $help = Get-Help about_should
+        $help.count | Should Be 1
+        $help | Should BeOfType System.String
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private void AddFiles(string muiDirectory, string directory, string pattern)`
`161`	`161`	`string leafFileName = Path.GetFileName(file);`
`162`	`162`	`string uniqueToDirectory = Path.Combine(directory, leafFileName);`
`163`	`163`
`164`		`- if (!_uniqueMatches.Contains(uniqueToDirectory))`
	`164`	`+ if (!_result.Contains(path) && !_uniqueMatches.Contains(uniqueToDirectory))`
`165`	`165`	`{`
`166`	`166`	`_result.Add(path);`
`167`	`167`	`_uniqueMatches[uniqueToDirectory] = true;`
Original file line number	Diff line number	Diff line change
`@@ -180,3 +180,13 @@ Describe "Validate that Get-Help returns provider-specific help" -Tags @('CI', '`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`}`
	`183`	`+`
	`184`	`+Describe "Validate about_help.txt under culture specific folder works" -Tags @('CI') {`
	`185`	`+`
	`186`	`+ It "Get-Help about_should should return help text and not multiple HelpInfo objects" {`
	`187`	`+`
	`188`	`+ $help = Get-Help about_should`
	`189`	`+ $help.count \| Should Be 1`
	`190`	`+ $help \| Should BeOfType System.String`
	`191`	`+ }`
	`192`	`+}`