Merge remote-tracking branch 'upstream/master' into baseitemkind-fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Providers/IDirectoryService.cs b/MediaBrowser.Controller/Providers/IDirectoryService.cs
index f06481c7a..b1a36e102 100644
--- a/MediaBrowser.Controller/Providers/IDirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/IDirectoryService.cs
@@ -11,10 +11,10 @@ namespace MediaBrowser.Controller.Providers
 
         List<FileSystemMetadata> GetFiles(string path);
 
-        FileSystemMetadata GetFile(string path);
+        FileSystemMetadata? GetFile(string path);
 
         IReadOnlyList<string> GetFilePaths(string path);
 
-        IReadOnlyList<string> GetFilePaths(string path, bool clearCache);
+        IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false);
     }
 }