Replace GetFiles in TestModuleManifestCommand (#14317)

xtqqczze · web-flow · commit f74acaa768ea · 2020-12-09T11:59:08.000-08:00
diff --git a/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs b/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
@@ -420,23 +420,13 @@ private static bool IsValidGacAssembly(string assemblyName)
 
             try
             {
-                var allFiles = Directory.GetFiles(gacPath, assemblyFile, SearchOption.AllDirectories);
-
-                if (allFiles.Length == 0)
-                {
-                    var allNgenFiles = Directory.GetFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories);
-                    if (allNgenFiles.Length == 0)
-                    {
-                        return false;
-                    }
-                }
+                return Directory.EnumerateFiles(gacPath, assemblyFile, SearchOption.AllDirectories).Any()
+                    || Directory.EnumerateFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories).Any();
             }
             catch
             {
                 return false;
             }
-
-            return true;
 #endif
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -420,23 +420,13 @@ private static bool IsValidGacAssembly(string assemblyName)`
`420`	`420`
`421`	`421`	`try`
`422`	`422`	`{`
`423`		`- var allFiles = Directory.GetFiles(gacPath, assemblyFile, SearchOption.AllDirectories);`
`424`		`-`
`425`		`- if (allFiles.Length == 0)`
`426`		`- {`
`427`		`- var allNgenFiles = Directory.GetFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories);`
`428`		`- if (allNgenFiles.Length == 0)`
`429`		`- {`
`430`		`- return false;`
`431`		`- }`
`432`		`- }`
	`423`	`+ return Directory.EnumerateFiles(gacPath, assemblyFile, SearchOption.AllDirectories).Any()`
	`424`	`+ \|\| Directory.EnumerateFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories).Any();`
`433`	`425`	`}`
`434`	`426`	`catch`
`435`	`427`	`{`
`436`	`428`	`return false;`
`437`	`429`	`}`
`438`		`-`
`439`		`- return true;`
`440`	`430`	`#endif`
`441`	`431`	`}`
`442`	`432`	`}`