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

NuGet · May 25, 2016 · 8958582 · 8958582
2 parents a39bc60 + 9d34c91
commit 8958582
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ The home of the NuGet.server package, a lightweight standalone NuGet server
 
 ## Feedback
 
-If you're having trouble with the NuGet.org Website, file a bug on the [NuGet Gallery Issue Tracker](https://github.com/nuget/NuGetGallery/issues). 
+If you're having trouble with the NuGet.org Website or NuGet.Server, file a bug on the [NuGet Gallery Issue Tracker](https://github.com/nuget/NuGetGallery/issues). 
 
 If you're having trouble with the NuGet client tools (the Visual Studio extension, NuGet.exe command line tool, etc.), file a bug on [NuGet Home](https://github.com/nuget/home/issues).
 

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -13,7 +13,7 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("2.10.3.0")]
-[assembly: AssemblyFileVersion("2.10.3.0")]
+[assembly: AssemblyVersion("2.11.1.0")]
+[assembly: AssemblyFileVersion("2.11.1.0")]
 
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/src/NuGet.Server/Core/DefaultServiceResolver.cs b/src/NuGet.Server/Core/DefaultServiceResolver.cs
@@ -12,16 +12,19 @@ public class DefaultServiceResolver
         : IServiceResolver
     {
         private readonly IHashProvider _hashProvider;
-        private readonly IPackageService _packageService;
         private readonly IServerPackageRepository _packageRepository;
+        private readonly IPackageAuthenticationService _packageAuthenticationService;
+        private readonly IPackageService _packageService;
 
         public DefaultServiceResolver()
         {
             _hashProvider = new CryptoHashProvider(Constants.HashAlgorithm);
 
-            _packageRepository = new ServerPackageRepository(PackageUtility.PackagePhysicalPath,  _hashProvider, new TraceLogger());
+            _packageRepository = new ServerPackageRepository(PackageUtility.PackagePhysicalPath, _hashProvider, new TraceLogger());
 
-            _packageService = new PackageService(_packageRepository, new PackageAuthenticationService());
+            _packageAuthenticationService = new PackageAuthenticationService();
+
+            _packageService = new PackageService(_packageRepository, _packageAuthenticationService);
         }
 
         public object Resolve(Type type)
@@ -31,14 +34,19 @@ public object Resolve(Type type)
                 return _hashProvider;
             }
 
-            if (type == typeof(IPackageService))
+            if (type == typeof(IServerPackageRepository))
             {
-                return _packageService;
+                return _packageRepository;
             }
 
-            if (type == typeof(IServerPackageRepository))
+            if (type == typeof(IPackageAuthenticationService))
             {
-                return _packageRepository;
+                return _packageAuthenticationService;
+            }
+
+            if (type == typeof(IPackageService))
+            {
+                return _packageService;
             }
 
             return null;

diff --git a/src/NuGet.Server/Infrastructure/ServerPackageRepository.cs b/src/NuGet.Server/Infrastructure/ServerPackageRepository.cs
@@ -186,7 +186,7 @@ private void AddPackagesFromDropFolder()
                     try
                     {
                         // Create package
-                        var package = new ZipPackage(_fileSystem.OpenFile(packageFile));
+                        var package = new OptimizedZipPackage(_fileSystem, packageFile);
 
                         // Is it a symbols package?
                         if (IgnoreSymbolsPackages && package.IsSymbolsPackage())
@@ -235,6 +235,8 @@ private void AddPackagesFromDropFolder()
             }
             finally
             {
+                OptimizedZipPackage.PurgeCache();
+
                 MonitorFileSystem(true);
             }
         }
@@ -552,6 +554,8 @@ public void ClearCache()
             {
                 lock (_syncLock)
                 {
+                    OptimizedZipPackage.PurgeCache();
+
                     _serverPackageStore.Clear();
                     _serverPackageStore.Persist();
                     _logger.Log(LogLevel.Info, "Cleared package cache.");

diff --git a/src/NuGet.Server/NuGet.Server.csproj b/src/NuGet.Server/NuGet.Server.csproj
@@ -38,11 +38,12 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.10.1.766, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.10.1\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">

diff --git a/src/NuGet.Server/NuGet.Server.nuspec b/src/NuGet.Server/NuGet.Server.nuspec
@@ -16,7 +16,7 @@
       <frameworkAssembly assemblyName="System.Data.Services" />
     </frameworkAssemblies>
     <dependencies>
-      <dependency id="NuGet.Core" version="[2.10.1,)" />
+      <dependency id="NuGet.Core" version="[2.11.1,)" />
       <dependency id="Microsoft.Web.Xdt" version="[2.1.1,)" />
     </dependencies>
   </metadata>

diff --git a/src/NuGet.Server/Publishing/PackageService.cs b/src/NuGet.Server/Publishing/PackageService.cs
@@ -32,23 +32,43 @@ public void CreatePackage(HttpContextBase context)
 
             // Get the package from the request body
             // ReSharper disable once PossibleNullReferenceException
-            var stream = request.Files.Count > 0 ? request.Files[0].InputStream : request.InputStream;
+            var stream = request.Files.Count > 0
+                ? request.Files[0].InputStream 
+                : request.InputStream;
 
-            var package = new ZipPackage(stream);
+            // Copy the package to a temporary file
+            var temporaryFile = Path.GetTempFileName();
+            using (var temporaryFileStream = File.Open(temporaryFile, FileMode.OpenOrCreate, FileAccess.ReadWrite))
+            {
+                stream.CopyTo(temporaryFileStream);
+            }
+
+            var package = new OptimizedZipPackage(temporaryFile);
 
-            // Make sure they can access this package
+            // Make sure the user can access this package
             if (Authenticate(context, apiKey, package.Id))
             {
                 try
                 {
                     _serverRepository.AddPackage(package);
+
                     WriteStatus(context, HttpStatusCode.Created, "");
                 }
                 catch (InvalidOperationException ex)
                 {
                     WriteStatus(context, HttpStatusCode.InternalServerError, ex.Message);
                 }
             }
+
+            package = null;
+            try
+            {
+                File.Delete(temporaryFile);
+            }
+            catch (Exception)
+            {
+                WriteStatus(context, HttpStatusCode.InternalServerError, "Could not remove temporary upload file.");
+            }
         }
 
         public void PublishPackage(HttpContextBase context)

diff --git a/src/NuGet.Server/Strings.resx b/src/NuGet.Server/Strings.resx
@@ -121,6 +121,6 @@
     <value>Package {0} already exists. The server is configured to not allow overwriting packages that already exist.</value>
   </data>
   <data name="Error_SymbolsPackagesIgnored" xml:space="preserve">
-    <value>Package {0} is a symbols package (it contains .pdb fiels and a /src folder). The server is configured to ignore symbols packages.</value>
+    <value>Package {0} is a symbols package (it contains .pdb files and a /src folder). The server is configured to ignore symbols packages.</value>
   </data>
 </root>
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" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" />
-  <package id="NuGet.Core" version="2.10.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="NuGet.Core" version="2.11.1" targetFramework="net45" />
   <package id="RouteMagic" version="1.3" targetFramework="net40" />
   <package id="WebActivatorEx" version="2.1.0" targetFramework="net45" />
 </packages>
diff --git a/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj b/test/NuGet.Server.Tests/NuGet.Server.Tests.csproj
@@ -23,17 +23,19 @@
       <HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.5.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Moq.4.5.0\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.10.1.766, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.10.1\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
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
-  <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" />
-  <package id="NuGet.Core" version="2.10.1" targetFramework="net45" />
+  <package id="Moq" version="4.5.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="NuGet.Core" version="2.11.1" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />