Make PhysicalFile Watcher and Provider disposable

src/Microsoft.AspNet.FileProviders.Physical/PhysicalFileProvider.cs

@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.FileProviders
     /// <summary>
     /// Looks up files using the on-disk file system
     /// </summary>
-    public class PhysicalFileProvider : IFileProvider
+    public class PhysicalFileProvider : IFileProvider, IDisposable
     {
         private readonly PhysicalFilesWatcher _filesWatcher;
 
@@ -38,6 +38,11 @@ public PhysicalFileProvider(string root)
             _filesWatcher = new PhysicalFilesWatcher(Root);
         }
 
+        public void Dispose()
+        {
+            _filesWatcher.Dispose();
+        }
+
         /// <summary>
         /// The root directory for this instance.
         /// </summary>
@@ -105,7 +110,7 @@ public IFileInfo GetFileInfo(string subpath)
                 return new NotFoundFileInfo(subpath);
             }
 
-            return new PhysicalFileInfo(_filesWatcher, fileInfo);
+            return new PhysicalFileInfo(fileInfo);
         }
 
         /// <summary>
@@ -152,7 +157,7 @@ public IDirectoryContents GetDirectoryContents(string subpath)
                         var fileInfo = fileSystemInfo as FileInfo;
                         if (fileInfo != null)
                         {
-                            virtualInfos.Add(new PhysicalFileInfo(_filesWatcher, fileInfo));
+                            virtualInfos.Add(new PhysicalFileInfo(fileInfo));
                         }
                         else
                         {
@@ -198,12 +203,9 @@ private class PhysicalFileInfo : IFileInfo
         {
             private readonly FileInfo _info;
 
-            private readonly PhysicalFilesWatcher _filesWatcher;
-
-            public PhysicalFileInfo(PhysicalFilesWatcher filesWatcher, FileInfo info)
+            public PhysicalFileInfo(FileInfo info)
             {
                 _info = info;
-                _filesWatcher = filesWatcher;
             }
 
             public bool Exists

src/Microsoft.AspNet.FileProviders.Physical/PhysicalFilesWatcher.cs

@@ -10,7 +10,7 @@
 
 namespace Microsoft.AspNet.FileProviders
 {
-    internal class PhysicalFilesWatcher
+    internal class PhysicalFilesWatcher : IDisposable
     {
         private readonly ConcurrentDictionary<string, FileChangeToken> _tokenCache =
             new ConcurrentDictionary<string, FileChangeToken>(StringComparer.OrdinalIgnoreCase);
@@ -55,6 +55,11 @@ internal IChangeToken CreateFileChangeToken(string filter)
             return changeToken;
         }
 
+        public void Dispose()
+        {
+            _fileWatcher.Dispose();
+        }
+
         private void OnRenamed(object sender, RenamedEventArgs e)
         {
             // For a file name change or a directory's name change notify registered tokens.