Merge pull request Azure#3879 from djyou/preview

[ACR] Fix help messages

Author: cormacpayne

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/RemoveAzureContainerRegistry.cs

@@ -48,14 +48,14 @@ public class RemoveAzureContainerRegistry : ContainerRegistryCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            if (ShouldProcess(Name, "Remove Container Registry"))
+            if (string.Equals(ParameterSetName, RegistryObjectParameterSet))
             {
-                if (string.Equals(ParameterSetName, RegistryObjectParameterSet))
-                {
-                    ResourceGroupName = Registry.ResourceGroupName;
-                    Name = Registry.Name;
-                }
+                ResourceGroupName = Registry.ResourceGroupName;
+                Name = Registry.Name;
+            }
 
+            if (ShouldProcess(Name, "Remove Container Registry"))
+            {
                 RegistryClient.DeleteRegistry(ResourceGroupName, Name);
             }
         }

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/UpdateAzureContainerRegistry.cs

@@ -18,7 +18,9 @@
 
 namespace Microsoft.Azure.Commands.ContainerRegistry
 {
-    [Cmdlet(VerbsData.Update, ContainerRegistryNoun, DefaultParameterSetName = "Empty", SupportsShouldProcess = true),
+    [Cmdlet(VerbsData.Update, ContainerRegistryNoun,
+        DefaultParameterSetName = "Empty",
+        SupportsShouldProcess = true),
         OutputType(typeof(PSContainerRegistry))]
     public class UpdateAzureContainerRegistry : ContainerRegistryCmdletBase
     {
@@ -77,7 +79,7 @@ public class UpdateAzureContainerRegistry : ContainerRegistryCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            if (ShouldProcess(Name, "Remove Container Registry"))
+            if (ShouldProcess(Name, "Update Container Registry"))
             {
                 var tags = TagsConversionHelper.CreateTagDictionary(Tag, validate: true);
 

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands/UpdateAzureContainerRegistryCredential.cs

@@ -57,14 +57,14 @@ public class UpdateAzureContainerRegistryCredential : ContainerRegistryCmdletBas
 
         public override void ExecuteCmdlet()
         {
-            if (ShouldProcess(Name, string.Format("Update Container Registry Credential '{0}'", PasswordName)))
+            if (string.Equals(ParameterSetName, RegistryObjectParameterSet))
             {
-                if (string.Equals(ParameterSetName, RegistryObjectParameterSet))
-                {
-                    ResourceGroupName = Registry.ResourceGroupName;
-                    Name = Registry.Name;
-                }
+                ResourceGroupName = Registry.ResourceGroupName;
+                Name = Registry.Name;
+            }
 
+            if (ShouldProcess(Name, string.Format("Update Container Registry Credential '{0}'", PasswordName)))
+            {
                 var credentials = RegistryClient.RegenerateRegistryCredential(ResourceGroupName, Name, PasswordName);
                 WriteObject(new PSContainerRegistryCredential(credentials));
             }