Update for File Share Snapshot feature per feedback

Author: blueww

src/Storage/ChangeLog.md

@@ -19,9 +19,9 @@
 -->
 ## Current Release
 * Upgrade to Azure Storage Client Library 8.5.0 and Azure Storage DataMovement Library 0.6.3
-* Add File Share Snapshot Support 
-    - Get-AzureStorageShare
-    - Remove-AzureStorageShare
+* Add File Share Snapshot Support Feature
+    - Add 'SnapshotTime' parameter to Get-AzureStorageShare
+    - Add 'IncludeAllSnapshot' parameter to Remove-AzureStorageShare
 
 ## Version 3.4.1
 

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

@@ -66,7 +66,6 @@
     <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.6.3\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -242,7 +241,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="MSSharedLibKey.snk" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">

src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShare.cs

@@ -29,7 +29,7 @@ public class GetAzureStorageShare : AzureStorageFileCmdletBase
             Position = 0,
             Mandatory = true,
             ParameterSetName = Constants.SpecificParameterSetName,
-            HelpMessage = "Name of the file share to be gotten.")]
+            HelpMessage = "Name of the file share to be received.")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -43,7 +43,7 @@ public class GetAzureStorageShare : AzureStorageFileCmdletBase
         Position = 1,
         Mandatory = false,
         ParameterSetName = Constants.SpecificParameterSetName,
-        HelpMessage = "Snapshot Time of the file share snapshot to be gotten.")]
+        HelpMessage = "SnapshotTime of the file share snapshot to be received.")]
                 [ValidateNotNullOrEmpty]
                 public DateTimeOffset? SnapshotTime { get; set; }
 

src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs

@@ -119,27 +119,23 @@ public override void ExecuteCmdlet()
                         }
                         catch (StorageException e)
                         {
-                            if (e.IsConflictException() && retryDeleteSnapshot)
-                            {
-                                //If x-ms-delete-snapshots is not specified on the request and the share has associated snapshots, the File service returns status code 409 (Conflict).
-                                retryDeleteSnapshot = true;
-                            }
-                            else
+                            //If x-ms-delete-snapshots is not specified on the request and the share has associated snapshots, the File service returns status code 409 (Conflict).
+                            if (!(e.IsConflictException() && retryDeleteSnapshot))
                             {
                                 throw;
                             }
                         }
 
                         if (retryDeleteSnapshot)
                         {
-                            if (force || await OutputStream.ConfirmAsync(string.Format("This share might has snapshots, Remove the share and all snapshots?: {0}", share.Name)).ConfigureAwait(false))
+                            if (force || await OutputStream.ConfirmAsync(string.Format("This share might have snapshots, remove the share and all snapshots?: {0}", share.Name)).ConfigureAwait(false))
                             {
                                 deleteShareSnapshotsOption = DeleteShareSnapshotsOption.IncludeSnapshots;
                                 await this.Channel.DeleteShareAsync(share, deleteShareSnapshotsOption, null, this.RequestOptions, this.OperationContext, this.CmdletCancellationToken).ConfigureAwait(false);
                             }
                             else
                             {
-                                string result = string.Format("The remove operation of  share '{0}' is cancelled.", share.Name);
+                                string result = string.Format("The remove operation of share '{0}' has been cancelled.", share.Name);
                                 OutputStream.WriteVerbose(taskId, result);
                             }
                         }

src/Storage/Commands.Storage/help/Get-AzureStorageShare.md

@@ -163,7 +163,7 @@ Accept wildcard characters: False
 ```
 
 ### -SnapshotTime
-Snapshot Time of the file share snapshot to be gotten.
+SnapshotTime of the file share snapshot to be received.
 
 ```yaml
 Type: DateTimeOffset

src/Storage/Commands.Storage/help/Remove-AzureStorageShare.md

@@ -40,7 +40,7 @@ This command removes the file share named ContosoShare06.
 
 ### Example 2: Remove a file share and all its snapshots
 ```
-PS C:\>Remove-AzureStorageShare -Name "ContosoShare06" -IncludeSnapshot
+PS C:\>Remove-AzureStorageShare -Name "ContosoShare06" -IncludeAllSnapshot
 ```
 
 This command removes the file share named ContosoShare06 and all its snapshots.

src/Storage/Commands.Storage/packages.config

@@ -6,7 +6,6 @@
   <package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
   <package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
   <package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net452" />
   <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" />