Resolve storage unit test issue.

Author: EmmaZhu

setup/azurecmdfiles.wxi

@@ -829,9 +829,6 @@
                         <Component Id="cmp5705CFB01232C814C9F376E8BD72C6A9" Guid="*">
                             <File Id="filA1CEB5C190533E13ED3888E1A3E4EE0E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.WindowsAzure.Commands.WebSites.Types.ps1xml" />
                         </Component>
-                        <Component Id="cmp30653BC5E58466A843826FFD56DA69CF" Guid="*">
-                            <File Id="fil98739FE5B0364C68F92F337738738F68" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.WindowsAzure.Configuration.dll" />
-                        </Component>
                         <Component Id="cmpB3E0988D507FCECBEC2C992B92E3920F" Guid="*">
                             <File Id="filD4385B21F65B6D462CCD029613959F95" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.WindowsAzure.Management.dll" />
                         </Component>
@@ -1155,9 +1152,6 @@
                         <Component Id="cmp667B7A1CD97B13D70F6CFA9D955799A6" Guid="*">
                             <File Id="fil51C0DF0D652E5ADBF17624B351AD692B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.WindowsAzure.Commands.Profile.format.ps1xml" />
                         </Component>
-                        <Component Id="cmpA6DD76F2CE256E42641B7CC31386A776" Guid="*">
-                            <File Id="filF406759FFC8FF388A46EA4CA8D6B47BA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.WindowsAzure.Configuration.dll" />
-                        </Component>
                         <Component Id="cmpC8BA74B745B52059308DE7A6D162EE8F" Guid="*">
                             <File Id="filFB97CF0896BE2E3AD239ECD2BEB749C2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.WindowsAzure.Management.dll" />
                         </Component>
@@ -1395,9 +1389,6 @@
                         <Component Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" Guid="*">
                             <File Id="filDB364E77519F6ACAA5B9CE685AB1AFB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.WindowsAzure.Storage.dll" />
                         </Component>
-                        <Component Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" Guid="*">
-                            <File Id="fil3E19CAF38E35341A8646C8D13141B4E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Newtonsoft.Json.dll" />
-                        </Component>
                         <Component Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" Guid="*">
                             <File Id="filC27FF716D5D45BE809FDF4A013ED221B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Net.Http.Formatting.dll" />
                         </Component>
@@ -2494,9 +2485,6 @@
                         <Component Id="cmp55D02154CBD597E4C34E832780CAB861" Guid="*">
                             <File Id="filA716691369DC23F18A82F5CC795AA248" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.WindowsAzure.Commands.Profile.format.ps1xml" />
                         </Component>
-                        <Component Id="cmp3E80CDE849B274075168444B89F66D73" Guid="*">
-                            <File Id="fil767EC14BF550F3799EE3FFA5AF56238E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.WindowsAzure.Configuration.dll" />
-                        </Component>
                         <Component Id="cmpC1532ADE5FB25EC226C31BD06FDC7C20" Guid="*">
                             <File Id="fil3A690321104497483F4E01E040E5BFBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.WindowsAzure.Management.dll" />
                         </Component>
@@ -5227,7 +5215,6 @@
             <ComponentRef Id="cmp4C111D872C25352B90FF2BC0A0780E50" />
             <ComponentRef Id="cmpB287F6D4D7B1B7512B59CE52EB810D94" />
             <ComponentRef Id="cmp5705CFB01232C814C9F376E8BD72C6A9" />
-            <ComponentRef Id="cmp30653BC5E58466A843826FFD56DA69CF" />
             <ComponentRef Id="cmpB3E0988D507FCECBEC2C992B92E3920F" />
             <ComponentRef Id="cmpBFCB1E992759555E524E0637A72EE14B" />
             <ComponentRef Id="cmp02F11033E68D6FED58954A529B7DC8CC" />
@@ -5325,7 +5312,6 @@
             <ComponentRef Id="cmp3E8E747FAA6B7858FFCA940740658BD5" />
             <ComponentRef Id="cmp5364EF7068CE1CD568984E413222A1B9" />
             <ComponentRef Id="cmp667B7A1CD97B13D70F6CFA9D955799A6" />
-            <ComponentRef Id="cmpA6DD76F2CE256E42641B7CC31386A776" />
             <ComponentRef Id="cmpC8BA74B745B52059308DE7A6D162EE8F" />
             <ComponentRef Id="cmp76BB7CDB96C84A2462BB6AE77257DDF6" />
             <ComponentRef Id="cmp5B21FDE396B40BC62C2A08FB8F9ECFFB" />
@@ -5403,7 +5389,6 @@
             <ComponentRef Id="cmp209CCEE0DCF9E72717C6DEDE4C8984E1" />
             <ComponentRef Id="cmp7BECB13532E43A81AFC0959E29FF1F56" />
             <ComponentRef Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" />
-            <ComponentRef Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" />
             <ComponentRef Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" />
             <ComponentRef Id="cmp0BBA12BCAEC94783EC690D768E1A9476" />
             <ComponentRef Id="cmp704145D9362A78B6368BC991ADFDDD72" />
@@ -5762,7 +5747,6 @@
             <ComponentRef Id="cmp07AAE83D7AB784DEF2482743A904A656" />
             <ComponentRef Id="cmpA6269058AD07EC84DD573E192B4A56B9" />
             <ComponentRef Id="cmp55D02154CBD597E4C34E832780CAB861" />
-            <ComponentRef Id="cmp3E80CDE849B274075168444B89F66D73" />
             <ComponentRef Id="cmpC1532ADE5FB25EC226C31BD06FDC7C20" />
             <ComponentRef Id="cmp97FEBF68F374AAB490FD2806F831D8E1" />
             <ComponentRef Id="cmp80FE7A56B007BCFE285874C5F279A7FB" />

src/ServiceManagement/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageBlob.cs

@@ -114,13 +114,13 @@ public RemoveStorageAzureBlobCommand(IStorageBlobManagement channel)
         /// <returns>true if the blob is removed successfully, false if user cancel the remove operation</returns>
         internal async Task RemoveAzureBlob(long taskId, IStorageBlobManagement localChannel, CloudBlob blob, bool isValidBlob)
         {
-            ValidateBlobType(blob);
-
             if (!isValidBlob)
             {
                 ValidatePipelineCloudBlob(blob);
             }
 
+            ValidateBlobType(blob);
+
             DeleteSnapshotsOption deleteSnapshotsOption = DeleteSnapshotsOption.None;
             bool retryDeleteSnapshot = false;