(GH-5) Adjust to use IPackageDownloader

src/Core/Packages/DataServicePackage.cs

@@ -317,7 +317,7 @@ internal IDataServiceContext Context
             set;
         }
 
-        internal PackageDownloader Downloader { get; set; }
+        internal IPackageDownloader Downloader { get; set; }
 
         internal IHashProvider HashProvider
         {

src/Core/Repositories/DataServicePackageRepository.cs

@@ -30,7 +30,7 @@ public class DataServicePackageRepository :
 
         private IDataServiceContext _context;
         private readonly IHttpClient _httpClient;
-        private readonly PackageDownloader _packageDownloader;
+        private readonly IPackageDownloader _packageDownloader;
         private CultureInfo _culture;
         private Tuple<string, string, string> _currentOperation;
         private event EventHandler<WebRequestEventArgs> _sendingRequest;
@@ -45,7 +45,7 @@ public DataServicePackageRepository(IHttpClient client)
         {
         }
 
-        public DataServicePackageRepository(IHttpClient client, PackageDownloader packageDownloader)
+        public DataServicePackageRepository(IHttpClient client, IPackageDownloader packageDownloader)
         {
             if (client == null)
             {
@@ -148,7 +148,7 @@ public CultureInfo Culture
         }
 
         // Do NOT delete this property. It is used by the functional test.
-        public PackageDownloader PackageDownloader
+        public IPackageDownloader PackageDownloader
         {
             get { return _packageDownloader; }
         }

src/Core/Utility/IPackageDownloader.cs

@@ -5,6 +5,7 @@ namespace NuGet
 
     public interface IPackageDownloader : IHttpClientEvents
     {
+        string CurrentDownloadPackageId { get; }
         void DownloadPackage(Uri uri, IPackageMetadata package, Stream targetStream);
         void DownloadPackage(IHttpClient downloadClient, IPackageName package, Stream targetStream);
     }