PowerShell · daxian-dbw · Jul 25, 2018 · Jun 9, 2018 · Jun 9, 2018 · Jun 9, 2018
diff --git a/src/Microsoft.PowerShell.Security/security/Utils.cs b/src/Microsoft.PowerShell.Security/security/Utils.cs
@@ -204,7 +204,7 @@ internal static string GetFilePathOfExistingFile(PSCmdlet cmdlet,
                                                          string path)
         {
             string resolvedProviderPath = cmdlet.SessionState.Path.GetUnresolvedProviderPathFromPSPath(path);
-            if (Utils.FileExists(resolvedProviderPath))
+            if (File.Exists(resolvedProviderPath))
             {
                 return resolvedProviderPath;
             }

diff --git a/src/System.Management.Automation/engine/CommandSearcher.cs b/src/System.Management.Automation/engine/CommandSearcher.cs
@@ -578,7 +578,7 @@ private CommandInfo GetInfoFromPath(string path)
 
             do // false loop
             {
-                if (!Utils.FileExists(path))
+                if (!File.Exists(path))
                 {
                     CommandDiscovery.discoveryTracer.TraceError("The path does not exist: {0}", path);
                     break;

diff --git a/src/System.Management.Automation/engine/Modules/AnalysisCache.cs b/src/System.Management.Automation/engine/Modules/AnalysisCache.cs
@@ -650,10 +650,9 @@ private void Cleanup()
             var keys = Entries.Keys;
             foreach (var key in keys)
             {
-                if (!Utils.FileExists(key))
+                if (!File.Exists(key))
                 {
-                    ModuleCacheEntry unused;
-                    removedSomething |= Entries.TryRemove(key, out unused);
+                    removedSomething |= Entries.TryRemove(key, out ModuleCacheEntry _);
                 }
             }
 
@@ -690,7 +689,7 @@ private void Serialize(string filename)
 
             try
             {
-                if (Utils.FileExists(filename))
+                if (File.Exists(filename))
                 {
                     var fileLastWriteTime = new FileInfo(filename).LastWriteTime;
                     if (fileLastWriteTime > this.LastReadTime)
@@ -987,7 +986,7 @@ internal static AnalysisCacheData Get()
             {
                 try
                 {
-                    if (Utils.FileExists(s_cacheStoreLocation))
+                    if (File.Exists(s_cacheStoreLocation))
                     {
                         return Deserialize(s_cacheStoreLocation);
                     }

diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -297,7 +297,7 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
                             {
                                 qualifiedPath = Path.Combine(qualifiedPath, fileBaseName);
                             }
-                            else if (Utils.DirectoryExists(qualifiedPath))
+                            else if (Directory.Exists(qualifiedPath))
                             {
                                 // if it points to a directory, add the basename back onto the path...
                                 qualifiedPath = Path.Combine(qualifiedPath, Path.GetFileName(fileBaseName));
@@ -906,10 +906,9 @@ private IEnumerable<PSModuleInfo> GetModuleForRootedPaths(List<string> modulePat
                     foreach (string resolvedModulePath in modulePathCollection)
                     {
                         string moduleName = Path.GetFileName(resolvedModulePath);
-                        bool isDirectory = Utils.DirectoryExists(resolvedModulePath);
 
                         // If the given path is a valid module file, we will load the specific file
-                        if (!isDirectory && ModuleIntrinsics.IsPowerShellModuleExtension(Path.GetExtension(moduleName)))
+                        if (!Directory.Exists(resolvedModulePath) && ModuleIntrinsics.IsPowerShellModuleExtension(Path.GetExtension(moduleName)))
                         {
                             PSModuleInfo module = CreateModuleInfoForGetModule(resolvedModulePath, refresh);
                             if (module != null)
@@ -1578,7 +1577,7 @@ internal PSModuleInfo LoadModuleManifest(
                         return loadedModule;
                     }
                     // remove the module if force is specified  (and if module is already loaded)
-                    else if (Utils.FileExists(rootedPath))
+                    else if (File.Exists(rootedPath))
                     {
                         RemoveModule(loadedModule);
                     }
@@ -4228,7 +4227,7 @@ private bool GetListOfFilesFromData(
                             // which we can't really do b/c the file doesn't exist.
                             fixedFileName = psHome + "\\" + Path.GetFileName(s);
                         }
-                        else if (verifyFilesExist && !Utils.FileExists(fixedFileName))
+                        else if (verifyFilesExist && !File.Exists(fixedFileName))
                         {
                             string message = StringUtil.Format(SessionStateStrings.PathNotFound, fixedFileName);
                             throw new FileNotFoundException(message, fixedFileName);
@@ -4952,7 +4951,7 @@ internal PSModuleInfo IsModuleImportUnnecessaryBecauseModuleIsAlreadyLoaded(stri
                     else // reimport the module + return alreadyLoadedModule (alreadyLoadedModule = no need to proceed with regular import)
                     {
                         // If the module has already been loaded, then while loading it the second time, we should load it with the DefaultCommandPrefix specified in the module manifest. (If there is no Prefix from command line)
-                        if (string.IsNullOrEmpty(prefix) && Utils.FileExists(alreadyLoadedModule.Path))
+                        if (string.IsNullOrEmpty(prefix) && File.Exists(alreadyLoadedModule.Path))
                         {
                             string defaultPrefix = GetDefaultPrefix(alreadyLoadedModule);
                             if (!string.IsNullOrEmpty(defaultPrefix))
@@ -5128,7 +5127,7 @@ internal PSModuleInfo LoadUsingExtensions(PSModuleInfo parentModule,
                     found = true;
                     return module;
                 }
-                else if (Utils.FileExists(fileName))
+                else if (File.Exists(fileName))
                 {
                     moduleFileFound = true;
                     // Win8: 325243 - Added the version check so that we do not unload modules with the same name but different version
@@ -5278,7 +5277,7 @@ internal PSModuleInfo LoadModule(PSModuleInfo parentModule, string fileName, str
         {
             Dbg.Assert(fileName != null, "Filename argument to LoadModule() shouldn't be null");
 
-            if (!Utils.FileExists(fileName))
+            if (!File.Exists(fileName))
             {
                 found = false;
                 moduleFileFound = false;

diff --git a/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs b/src/System.Management.Automation/engine/SessionStateDriveAPIs.cs
@@ -963,25 +963,9 @@ private bool IsAStaleVhdMountedDrive(PSDriveInfo drive)
 
                         if (systemDriveInfo.DriveType == DriveType.NoRootDirectory)
                         {
-                            try
-                            {
-                                // Checking for the presence of mounted drive locally using Utils.DirectoryExists API as
-                                // the calls to this API is faster than normal Directory.Exist API.
-                                bool validDrive = Utils.DirectoryExists(drive.Root);
-                                if (!validDrive)
-                                {
-                                    result = true;
-                                }
-                            }
-                            // We don't want to have automounting cause an exception. We
-                            // rather it just fail silently as it wasn't a result of an
-                            // explicit request by the user anyway.
-                            // Following the same pattern as the Calling API.
-                            catch (IOException)
-                            {
-                            }
-                            catch (UnauthorizedAccessException)
+                            if (!Directory.Exists(drive.Root))
                             {
+                                result = true;
                             }
                         }
                     }

diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
@@ -889,61 +889,6 @@ internal static bool IsAdministrator()
 #endif
         }
 
-        internal static bool ItemExists(string path)
-        {
-            try
-            {
-                return ItemExists(path, out bool _);
-            }
-            catch
-            {
-            }
-
-            return false;
-        }
-
-        internal static bool ItemExists(string path, out bool isDirectory)
-        {
-            isDirectory = false;
-
-            if (String.IsNullOrEmpty(path))
-            {
-                return false;
-            }
-
-            if (IsReservedDeviceName(path))
-            {
-                return false;
-            }
-
-            try
-            {
-                // Use 'File.GetAttributes()' because we want to get access exceptions.
-                FileAttributes attributes = File.GetAttributes(path);
-                isDirectory = attributes.HasFlag(FileAttributes.Directory);
-
-                return (int)attributes != -1;
-            }
-            catch (IOException)
-            {
-                return false;
-            }
-        }
-
-        internal static bool FileExists(string path)
-        {
-            bool itemExists = ItemExists(path, out bool isDirectory);
-
-            return (itemExists && (!isDirectory));
-        }
-
-        internal static bool DirectoryExists(string path)
-        {
-            bool itemExists = ItemExists(path, out bool isDirectory);
-
-            return (itemExists && isDirectory);
-        }
-
         internal static void NativeEnumerateDirectory(string directory, out List<string> directories, out List<string> files)
         {
             IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);

@@ -1627,32 +1627,33 @@ internal static string LoadStringFromPath(PSCmdlet cmdlet, string path, PSCreden
         /// <returns></returns>
         internal static string GetFilePath(string path)
         {
+            FileInfo item = new FileInfo(path);
+
+            // We use 'FileInfo.Attributes' (not 'FileInfo.Exist')
+            // because we want to get exceptions
+            // like UnauthorizedAccessException or IOException.
+            if ((int)item.Attributes != -1)
+            {
+                return path;
+            }
 #if UNIX
             // On Linux, file paths are case sensitive.
             // The user does not have control over the files (HelpInfo.xml, .zip, and cab) that are generated by the Publishing team.
             // The logic below is to support updating help content via sourcepath parameter for case insensitive files.
-            FileInfo item = new FileInfo(path);
-            string directoryPath = item.Directory.FullName;
+            var dirInfo = item.Directory;
             string fileName = item.Name;
 
             // Prerequisite: The directory in the given path must exist and it is case sensitive.
-            if (Utils.DirectoryExists(directoryPath))
+            if (dirInfo.Exists)
             {
                 // Get the list of files in the directory.
-                string[] fileList = Directory.GetFiles(directoryPath);
-                foreach (string filePath in fileList)
+                FileInfo[] fileList = dirInfo.GetFiles(searchPattern: fileName, new System.IO.EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive });
+
+                if (fileList.Length > 0)
                 {
-                    if (filePath.EndsWith(fileName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return filePath;
-                    }
+                    return fileList[0].FullName;
                 }
             }
-#else
-            if (Utils.FileExists(path))
-            {
-                return path;
-            }
 #endif
             return null;
         }