Updated error messages; Removed scope-less aliases; changed -Purge to -PurgeResources in Remove-Az* cmdlets

Author: Xynoclafe

src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzDeploymentStack.cs renamed to src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStack.cs

@@ -21,10 +21,9 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using System.Management.Automation;
     using System.Text;
 
-    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "DeploymentStack",
-        DefaultParameterSetName = GetAzDeploymentStack.ListParameterSetname), OutputType(typeof(PSDeploymentStack))]
-    [Alias("Get-AzSubscriptionDeploymentStack")]
-    public class GetAzDeploymentStack : DeploymentStacksCmdletBase
+    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "SubscriptionDeploymentStack",
+        DefaultParameterSetName = GetAzSubscriptionDeploymentStack.ListParameterSetname), OutputType(typeof(PSDeploymentStack))]
+    public class GetAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
     {
         #region Cmdlet Parameters and Parameter Set Definitions
 

src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzDeploymentStackSnapshot.cs renamed to src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStackSnapshot.cs

@@ -21,10 +21,9 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     using System.Management.Automation;
     using System.Text;
 
-    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "DeploymentStackSnapshot",
-        DefaultParameterSetName = GetAzDeploymentStackSnapshot.ListParameterSetname), OutputType(typeof(PSDeploymentStackSnapshot))]
-    [Alias("Get-AzSubscriptionDeploymentStackSnapshot")]
-    public class GetAzDeploymentStackSnapshot : DeploymentStacksCmdletBase
+    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "SubscriptionDeploymentStackSnapshot",
+        DefaultParameterSetName = GetAzSubscriptionDeploymentStackSnapshot.ListParameterSetname), OutputType(typeof(PSDeploymentStackSnapshot))]
+    public class GetAzSubscriptionDeploymentStackSnapshot : DeploymentStacksCmdletBase
     {
         #region Cmdlet Parameters and Parameter Set Definitions
 

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs

@@ -52,7 +52,7 @@ public class RemoveAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
 
         [Parameter(Mandatory = false,
         HelpMessage = "Delete all resources along with the stack.")]
-        public SwitchParameter Purge { get; set; }
+        public SwitchParameter PurgeResources { get; set; }
 
         #endregion
 
@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()
 
                 string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
 
-                string deleteBehavior = Purge.IsPresent ? "all" : null;
+                string deleteBehavior = PurgeResources.IsPresent ? "all" : null;
 
                 ConfirmAction(
                     Force.IsPresent,

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs

@@ -47,7 +47,7 @@ public class RemoveAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
 
         [Parameter(Mandatory = false,
         HelpMessage = "Delete all resources along with the stack.")]
-        public SwitchParameter Purge { get; set; }
+        public SwitchParameter PurgeResources { get; set; }
 
         #endregion
 
@@ -61,7 +61,7 @@ public override void ExecuteCmdlet()
 
                 string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
 
-                string deleteBehavior = Purge.IsPresent ? "all" : null;
+                string deleteBehavior = PurgeResources.IsPresent ? "all" : null;
 
                 ConfirmAction(
                     Force.IsPresent,

src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs

@@ -209,7 +209,7 @@ public override void ExecuteCmdlet()
                         throwIfNotExists: false) == null)
                 {
                     string confirmationMessage =
-                        $"The DeploymentStack '{Name}' you're trying to modify does not exist in the current subscription. Do you want to create a new stack?";
+                        $"The DeploymentStack '{Name}' you're trying to modify does not exist in the current subscription scope. Do you want to create a new stack?";
 
                     ConfirmAction(
                         Force.IsPresent,

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

@@ -214,7 +214,7 @@ public PSDeploymentStack GetSubscriptionDeploymentStack(string stackName, bool t
                             return null;
                         else
                             throw new PSArgumentException(
-                            $"DeploymentStack '{stackName}' not found in current subscription."
+                            $"DeploymentStack '{stackName}' not found in current subscription scope."
                         );
                     }
                     else
@@ -308,7 +308,7 @@ public PSDeploymentStackSnapshot GetSubscriptionDeploymentStackSnapshot(string s
                             return null;
                         else
                             throw new PSArgumentException(
-                            $"DeploymentStackSnapshot '{snapshotName}' of DeploymentStack '{stackName}' not found in current subscription."
+                            $"DeploymentStackSnapshot '{snapshotName}' of DeploymentStack '{stackName}' not found in current subscription scope."
                         );
                     }
                     else
@@ -414,7 +414,7 @@ internal void DeleteSubscriptionDeploymentStackSnapshot(string stackname, string
             if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)
             {
                 throw new PSArgumentException(
-                        $"DeploymentStack snapshot '{snapshotName}' of the DeploymentStack '{stackname}' not found."
+                        $"DeploymentStack snapshot '{snapshotName}' of the DeploymentStack '{stackname}' not found in the current subscription scope."
                     );
             }
 
@@ -448,7 +448,7 @@ internal void DeleteSubscriptionDeploymentStack(string name, string deleteBehavi
             if (deleteResponse.Response.StatusCode == System.Net.HttpStatusCode.NoContent)
             {
                 throw new PSArgumentException(
-                        $"DeploymentStack '{name}' not found."
+                        $"DeploymentStack '{name}' not found in the curent subscription scope."
                     );
             }
 

src/Resources/Resources/Az.Resources.psd1

@@ -158,7 +158,7 @@ CmdletsToExport = 'Get-AzProviderOperation', 'Remove-AzRoleAssignment',
                'New-AzSubscriptionDeploymentStack', 'Remove-AzResourceGroupDeploymentStack',
                'Remove-AzResourceGroupDeploymentStackSnapshot', 'Remove-AzSubscriptionDeploymentStack',
                'Remove-AzSubscriptionDeploymentStackSnapshot', 'Set-AzResourceGroupDeploymentStack',
-               'Set-AzSubscriptionDeploymentStack', 'Get-AzDeploymentStack', 'Get-AzDeploymentStackSnapshot'
+               'Set-AzSubscriptionDeploymentStack', 'Get-AzSubscriptionDeploymentStack', 'Get-AzSubscriptionDeploymentStackSnapshot'
 
 # Variables to export from this module
 # VariablesToExport = @()
@@ -174,9 +174,7 @@ AliasesToExport = 'Get-AzResourceProviderAction',
                'Stop-AzSubscriptionDeployment', 
                'Save-AzSubscriptionDeploymentTemplate', 
                'Get-AzSubscriptionDeploymentOperation', 
-               'Get-AzSubscriptionDeploymentWhatIfResult',
-               'Get-AzSubscriptionDeploymentStack',
-               'Get-AzSubscriptionDeploymentStackSnapshot'
+               'Get-AzSubscriptionDeploymentWhatIfResult'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()