Merge remote-tracking branch 'origin/master' into release

NuGet · Dec 21, 2016 · 0be065a · 0be065a
2 parents d2d6819 + 225d79f
commit 0be065a
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 38 deletions.
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -13,7 +13,7 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("2.14.0.0")]
-[assembly: AssemblyFileVersion("2.14.0.0")]
+[assembly: AssemblyVersion("2.11.3.0")]
+[assembly: AssemblyFileVersion("2.11.3.0")]
 
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/src/NuGet.Server/Infrastructure/ServerPackageRepository.cs b/src/NuGet.Server/Infrastructure/ServerPackageRepository.cs
@@ -569,7 +569,7 @@ public void ClearCache()
 
         private void MonitorFileSystem(bool monitor)
         {
-            if (!EnableFileSystemMonitoring || !_runBackgroundTasks)
+            if (!_runBackgroundTasks)
             {
                 return;
             }
@@ -599,7 +599,7 @@ private void MonitorFileSystem(bool monitor)
         private void RegisterFileSystemWatcher()
         {
             // When files are moved around, recreate the package cache
-            if (EnableFileSystemMonitoring && _runBackgroundTasks && _fileSystemWatcher == null && !string.IsNullOrEmpty(Source) && Directory.Exists(Source))
+            if (_runBackgroundTasks && _fileSystemWatcher == null && !string.IsNullOrEmpty(Source) && Directory.Exists(Source))
             {
                 // ReSharper disable once UseObjectOrCollectionInitializer
                 _fileSystemWatcher = new FileSystemWatcher(Source);
@@ -694,16 +694,7 @@ private bool EnableFrameworkFiltering
                 return _getSetting("enableFrameworkFiltering", false);
             }
         }
-
-        private bool EnableFileSystemMonitoring
-        {
-            get
-            {
-                // If the setting is misconfigured, treat it as on (backwards compatibility).
-                return _getSetting("enableFileSystemMonitoring", true);
-            }
-        }
-
+
         private static bool GetBooleanAppSetting(string key, bool defaultValue)
         {
             var appSettings = WebConfigurationManager.AppSettings;

diff --git a/src/NuGet.Server/NuGet.Server.csproj b/src/NuGet.Server/NuGet.Server.csproj
@@ -40,12 +40,14 @@
       <HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
+    <Reference Include="NuGet.Core, Version=2.11.1.812, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NuGet.Core.2.11.1\lib\net40-Client\NuGet.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RouteMagic, Version=1.3.0.0, Culture=neutral, PublicKeyToken=84b59be021aa4cee, processorArchitecture=MSIL">
@@ -69,7 +71,8 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\WebActivatorEx.2.1.0\lib\net40\WebActivatorEx.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WindowsBase" />

diff --git a/src/NuGet.Server/NuGet.Server.nuspec b/src/NuGet.Server/NuGet.Server.nuspec
@@ -17,11 +17,11 @@
     </frameworkAssemblies>
     <dependencies>
       <group targetFramework="net46">
-        <dependency id="NuGet.Core" version="2.14.0" />
+        <dependency id="NuGet.Core" version="2.11.1" />
         <dependency id="Microsoft.Web.Xdt" version="2.1.1" />
-        <dependency id="Newtonsoft.Json" version="9.0.1" />
+        <dependency id="Newtonsoft.Json" version="8.0.3" />
         <dependency id="RouteMagic" version="1.3.0" />
-        <dependency id="WebActivatorEx" version="2.2.0" />
+        <dependency id="WebActivatorEx" version="2.1.0" />
       </group>
     </dependencies>
   </metadata>

diff --git a/src/NuGet.Server/Web.config b/src/NuGet.Server/Web.config
@@ -49,13 +49,6 @@
     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.

diff --git a/src/NuGet.Server/packages.config b/src/NuGet.Server/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
+  <package id="NuGet.Core" version="2.11.1" targetFramework="net46" />
   <package id="RouteMagic" version="1.3" targetFramework="net46" />
-  <package id="WebActivatorEx" version="2.2.0" targetFramework="net46" />
+  <package id="WebActivatorEx" version="2.1.0" targetFramework="net46" />
 </packages>
diff --git a/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj b/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj
@@ -35,12 +35,14 @@
       <HintPath>..\..\packages\Moq.4.5.8\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
+    <Reference Include="NuGet.Core, Version=2.11.1.812, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NuGet.Core.2.11.1\lib\net40-Client\NuGet.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/test/NuGet.Server.Tests/packages.config b/test/NuGet.Server.Tests/packages.config
@@ -3,8 +3,8 @@
   <package id="Castle.Core" version="3.3.3" targetFramework="net46" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
   <package id="Moq" version="4.5.8" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
+  <package id="NuGet.Core" version="2.11.1" targetFramework="net46" />
   <package id="xunit" version="2.1.0" targetFramework="net46" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net46" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net46" />