From ed3a40dfa834b44a6a6d64c96d0123fb1a857658 Mon Sep 17 00:00:00 2001 From: Paul Higinbotham Date: Wed, 10 Nov 2021 16:08:05 -0800 Subject: [PATCH] Use Utils.DeleteDirectory consistently --- src/code/InstallHelper.cs | 4 ++-- src/code/PublishPSResource.cs | 2 +- src/code/UninstallPSResource.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs index d7b74640c..a3d8a4846 100644 --- a/src/code/InstallHelper.cs +++ b/src/code/InstallHelper.cs @@ -695,12 +695,12 @@ private void DeleteExtraneousFiles(string tempInstallPath, PackageIdentity pkgId if (Directory.Exists(relsDirToDelete)) { _cmdletPassedIn.WriteVerbose(string.Format("Deleting '{0}'", relsDirToDelete)); - Directory.Delete(relsDirToDelete, true); + Utils.DeleteDirectory(relsDirToDelete); } if (Directory.Exists(packageDirToDelete)) { _cmdletPassedIn.WriteVerbose(string.Format("Deleting '{0}'", packageDirToDelete)); - Directory.Delete(packageDirToDelete, true); + Utils.DeleteDirectory(packageDirToDelete); } } diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index d43babfef..4286bab86 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -413,7 +413,7 @@ protected override void ProcessRecord() } finally { WriteVerbose(string.Format("Deleting temporary directory '{0}'", outputDir)); - Directory.Delete(outputDir, recursive:true); + Utils.DeleteDirectory(outputDir); } } diff --git a/src/code/UninstallPSResource.cs b/src/code/UninstallPSResource.cs index 7964c0deb..1b627a3d4 100644 --- a/src/code/UninstallPSResource.cs +++ b/src/code/UninstallPSResource.cs @@ -227,7 +227,7 @@ private bool UninstallModuleHelper(string pkgPath, string pkgName, out ErrorReco { if (Utils.GetSubDirectories(dir.Parent.FullName).Length == 0) { - Directory.Delete(dir.Parent.FullName, true); + Utils.DeleteDirectory(dir.Parent.FullName); } } catch (Exception e) {