Merge remote-tracking branch 'refs/remotes/origin/master' into dev

# Conflicts:
#	src/NuGet.Server.Core/Infrastructure/ServerPackageRepository.cs

Author: scottbommarito

src/NuGet.Server.Core/Infrastructure/ServerPackageRepository.cs

@@ -587,7 +587,7 @@ public void ClearCache()
 
         private void MonitorFileSystem(bool monitor)
         {
-            if (!_runBackgroundTasks)
+            if (!EnableFileSystemMonitoring || !_runBackgroundTasks)
             {
                 return;
             }
@@ -617,7 +617,7 @@ private void MonitorFileSystem(bool monitor)
         private void RegisterFileSystemWatcher()
         {
             // When files are moved around, recreate the package cache
-            if (_runBackgroundTasks && _fileSystemWatcher == null && !string.IsNullOrEmpty(Source) && Directory.Exists(Source))
+            if (EnableFileSystemMonitoring && _runBackgroundTasks && _fileSystemWatcher == null && !string.IsNullOrEmpty(Source) && Directory.Exists(Source))
             {
                 // ReSharper disable once UseObjectOrCollectionInitializer
                 _fileSystemWatcher = new FileSystemWatcher(Source);
@@ -713,6 +713,15 @@ private bool EnableFrameworkFiltering
             }
         }
 
+        private bool EnableFileSystemMonitoring
+        {
+            get
+            {
+                // If the setting is misconfigured, treat it as on (backwards compatibility).
+                return _settingsProvider.GetBoolSetting("enableFileSystemMonitoring", true);
+            }
+        }
+
         private string GetPackageFileName(string packageId, SemanticVersion version)
         {
             return string.Format(TemplateNupkgFilename, packageId, version.ToNormalizedString());

src/NuGet.Server/Web.config

@@ -56,6 +56,13 @@
     Uncomment the following configuration entry to enable NAT support.
     -->
     <!-- <add key="aspnet:UseHostHeaderForRequestUrl" value="true" /> -->
+    <!--
+    Set enableFileSystemMonitoring to true (default) to enable file system monitoring (which will update the package cache appropriately on file system changes).
+    Set it to false to disable file system monitoring.
+    NOTE: Disabling file system monitoring may result in increased storage capacity requirements as package cache may only be purged by a background job running 
+    on a fixed 1-hour interval.
+    -->
+    <add key="enableFileSystemMonitoring" value="true" />
   </appSettings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.