HPF PR: dev <- Azure:dev

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -122,9 +122,9 @@
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
       <HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/Common/Commands.Common.Storage/packages.config

@@ -22,5 +22,5 @@
   <package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj

@@ -85,8 +85,9 @@
     <Reference Include="Microsoft.WindowsAzure.Configuration">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

src/Common/Storage/Commands.Storage.ScenarioTest/packages.config

@@ -13,6 +13,6 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj

@@ -64,8 +64,9 @@
     <Reference Include="Microsoft.WindowsAzure.Configuration">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

src/Common/Storage/Commands.Storage.StorageTestLib/packages.config

@@ -7,6 +7,6 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj

@@ -123,11 +123,11 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -188,7 +188,7 @@
     <Compile Include="Common\CommunicationExceptionUtilTest.cs" />
     <Compile Include="Common\FileNamingGenerator.cs" />
     <Compile Include="Common\IStorageManagement.cs" />
-    <Compile Include="Common\MockTransferJobRunner.cs" />
+    <Compile Include="Common\MockTransferManager.cs" />
     <Compile Include="Common\MockupException.cs" />
     <Compile Include="Common\NameUtilTest.cs" />
     <Compile Include="Common\CmdletOperationContextTest.cs" />
@@ -281,4 +281,4 @@
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>

src/Common/Storage/Commands.Storage.Test/Common/MockTransferJobRunner.cs → src/Common/Storage/Commands.Storage.Test/Common/MockTransferManager.cs

@@ -17,32 +17,34 @@
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.WindowsAzure.Commands.Storage.Common;
+using Microsoft.WindowsAzure.Storage.Blob;
 using Microsoft.WindowsAzure.Storage.DataMovement;
+using Microsoft.WindowsAzure.Storage.File;
 
 namespace Microsoft.WindowsAzure.Management.Storage.Test.Common
 {
-    internal sealed class MockTransferJobRunner : ITransferJobRunner
+    abstract class MockTransferManager : ITransferManager
     {
-        private Func<TransferJob, Task> runnerValidation;
+        private AssertFailedException assertException = null;
 
-        private AssertFailedException assertException;
+        public virtual Task DownloadAsync(CloudFile sourceFile, string destPath, DownloadOptions options, TransferContext context, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-        public MockTransferJobRunner(Func<TransferJob, Task> runnerValidation)
+        public virtual Task DownloadAsync(CloudBlob sourceBlob, string destPath, DownloadOptions options, TransferContext context, CancellationToken cancellationToken)
         {
-            this.runnerValidation = runnerValidation;
+            throw new NotImplementedException();
         }
 
-        public Task RunTransferJob(TransferJob job, Action<double, double> progressReport, CancellationToken cancellationToken)
+        public virtual Task UploadAsync(string sourcePath, CloudFile destFile, UploadOptions options, TransferContext context, CancellationToken cancellationToken)
         {
-            try
-            {
-                return runnerValidation(job);
-            }
-            catch (AssertFailedException e)
-            {
-                this.assertException = e;
-                throw new MockupException("AssertFailed");
-            }
+            throw new NotImplementedException();
+        }
+
+        public virtual Task UploadAsync(string sourcePath, CloudBlob destBlob, UploadOptions options, TransferContext context, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
         public void ThrowAssertExceptionIfAvailable()
@@ -52,9 +54,5 @@ public void ThrowAssertExceptionIfAvailable()
                 throw this.assertException;
             }
         }
-
-        public void Dispose()
-        {
-        }
     }
 }

src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileContentTest.cs

@@ -1,12 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.WindowsAzure.Commands.Storage.Common;
 using Microsoft.WindowsAzure.Commands.Storage.File;
 using Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet;
 using Microsoft.WindowsAzure.Management.Storage.Test.Common;
+using Microsoft.WindowsAzure.Storage.DataMovement;
+using Microsoft.WindowsAzure.Storage.File;
+using PSHFile = Microsoft.WindowsAzure.Commands.Storage.File;
 
 namespace Microsoft.WindowsAzure.Management.Storage.Test.File.Cmdlet
 {
@@ -46,7 +50,7 @@ public void DownloadFileUsingShareNameAndPathToLocalFileTest()
                 "remoteFile",
                 this.destinationFilePath,
                 () => this.CmdletInstance.RunCmdlet(
-                    Constants.ShareNameParameterSetName,
+                    PSHFile.Constants.ShareNameParameterSetName,
                     new KeyValuePair<string, object>("ShareName", "share"),
                     new KeyValuePair<string, object>("Path", "remoteFile"),
                     new KeyValuePair<string, object>("Destination", this.destinationFilePath)));
@@ -60,7 +64,7 @@ public void DownloadFileUsingShareObjectAndPathToLocalFileTest()
                 "remoteFile",
                 this.destinationFilePath,
                 () => this.CmdletInstance.RunCmdlet(
-                    Constants.ShareParameterSetName,
+                    PSHFile.Constants.ShareParameterSetName,
                     new KeyValuePair<string, object>("Share", this.MockChannel.GetShareReference("share")),
                     new KeyValuePair<string, object>("Path", "remoteFile"),
                     new KeyValuePair<string, object>("Destination", this.destinationFilePath)));
@@ -74,7 +78,7 @@ public void DownloadFileUsingDirectoryAndPathToLocalFileTest()
                 "remoteFile",
                 this.destinationFilePath,
                 () => this.CmdletInstance.RunCmdlet(
-                    Constants.DirectoryParameterSetName,
+                    PSHFile.Constants.DirectoryParameterSetName,
                     new KeyValuePair<string, object>("Directory", this.MockChannel.GetShareReference("share").GetRootDirectoryReference()),
                     new KeyValuePair<string, object>("Path", "remoteFile"),
                     new KeyValuePair<string, object>("Destination", this.destinationFilePath)));
@@ -88,7 +92,7 @@ public void DownloadFileUsingFileObjectToLocalFileTest()
                 "remoteFile",
                 this.destinationFilePath,
                 () => this.CmdletInstance.RunCmdlet(
-                    Constants.FileParameterSetName,
+                    PSHFile.Constants.FileParameterSetName,
                     new KeyValuePair<string, object>("File", this.MockChannel.GetShareReference("share").GetRootDirectoryReference().GetFileReference("remoteFile")),
                     new KeyValuePair<string, object>("Destination", this.destinationFilePath)));
         }
@@ -102,29 +106,43 @@ public void DownloadFileUsingFileObjectToLocalDirectoryTest()
                 "remoteFile",
                 this.destinationFilePath,
                 () => this.CmdletInstance.RunCmdlet(
-                    Constants.FileParameterSetName,
+                    PSHFile.Constants.FileParameterSetName,
                     new KeyValuePair<string, object>("File", this.MockChannel.GetShareReference("share").GetRootDirectoryReference().GetFileReference("remoteFile")),
                     new KeyValuePair<string, object>("Destination", this.destinationPath)));
         }
 
         private void DownloadFileInternal(string shareName, string fileName, string destination, Action downloadFileAction)
         {
-            var mockupRunner = new MockTransferJobRunner(
-                job =>
+            var mockupTransferManager = new DownloadTransferManager(
+            (sourceFile, destPath) =>
                 {
-                    Assert.AreEqual(destination, job.Destination.FilePath, "Destination validation failed.");
-                    Assert.AreEqual(shareName, job.Source.AzureFile.Share.Name, "Share validation failed.");
-                    Assert.AreEqual(fileName, job.Source.AzureFile.Name, "SourceFile validation failed.");
-                    return TaskEx.FromResult(true);
+                    Assert.AreEqual(destination, destPath, "Destination validation failed.");
+                    Assert.AreEqual(shareName, sourceFile.Share.Name, "Share validation failed.");
+                    Assert.AreEqual(fileName, sourceFile.Name, "SourceFile validation failed.");
                 });
 
-            TransferJobRunnerFactory.SetCachedRunner(mockupRunner);
+            TransferManagerFactory.SetCachedTransferManager(mockupTransferManager);
 
             downloadFileAction();
 
-            mockupRunner.ThrowAssertExceptionIfAvailable();
+            mockupTransferManager.ThrowAssertExceptionIfAvailable();
             this.MockCmdRunTime.OutputPipeline.AssertNoObject();
-            this.MockCmdRunTime.ErrorStream.AssertNoObject();
+        }
+
+        private sealed class DownloadTransferManager : MockTransferManager
+        {
+            private Action<CloudFile, string> validateAction;
+
+            public DownloadTransferManager(Action<CloudFile, string> validate)
+            {
+                validateAction = validate;
+            }
+
+            public override Task DownloadAsync(CloudFile sourceFile, string destFilePath, DownloadOptions options, TransferContext context, CancellationToken cancellationToken)
+            {
+                validateAction(sourceFile, destFilePath);
+                return TaskEx.FromResult(true);
+            }
         }
     }
 }