From 0f7e233fedee38c745c85a8fff618355c7d84371 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Sat, 31 Aug 2019 22:38:11 -0400 Subject: [PATCH] Updating development with recent changes on release/9.4.x (#2964) * Fix error running unit tests (#2940) When running tests, the following error occurs: VSTest: Could not locate executable. https://github.com/cake-build/cake/issues/1522#issuecomment-341612194 indicates that there's an issue using VS 2019, and presents a workaround to find the correct path * DNN-31366 - Deleted page can still be selected as parent page (#2925) * DNN-31366 - TabController HasChildren returns false if all children are deleted * Simplify HasChildren condition * deleting_themes_from_Extensions_doesnt_remove_it_from_themes (#2950) * Returns the working types if some fail (#2953) --- DNN Platform/Library/Common/Utilities/FileSystemUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs b/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs index 460cf316028..b2dcfabe253 100644 --- a/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs +++ b/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs @@ -454,7 +454,7 @@ public static void DeleteFilesRecursive(string strRoot, string filter) DeleteFilesRecursive(strFolder, filter); } } - foreach (string strFile in Directory.EnumerateFilePaths(strRoot).Where(f => f.Contains(filter))) + foreach (string strFile in Directory.EnumerateFilePaths(new DirectoryInfo(strRoot)).Where(f => f.Contains(filter))) { try {