Merge pull request #1374 from jianghaolu/dev

Enable ErrorActionPreference control of ProcessRecord

Author: stankovski

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

@@ -196,5 +196,4 @@
     </ProjectReference>
   </ItemGroup>
   <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>

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -487,6 +487,24 @@ protected void ConfirmAction(bool force, string actionMessage, string processMes
             }
         }
 
+        public virtual void ExecuteCmdlet()
+        {
+            // Do nothing.
+        }
+
+        protected override void ProcessRecord()
+        {
+            try
+            {
+                base.ProcessRecord();
+                ExecuteCmdlet();
+            }
+            catch (Exception ex)
+            {
+                WriteExceptionError(ex);
+            }
+        }
+
         protected virtual void Dispose(bool disposing)
         {
             if (_adalListener != null)

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

@@ -189,5 +189,4 @@
   </ItemGroup>
   <ItemGroup />
   <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>

src/Common/Storage/Commands.Storage.Test/File/PSCmdletReflectionHelper.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,6 +27,8 @@ internal static class PSCmdletReflectionHelper
     {
         private static readonly Type psCmdletType = typeof(PSCmdlet);
 
+        private static readonly Type azurePsCmdletType = typeof(AzurePSCmdlet);
+
         private static readonly FieldInfo parameterSetFieldInfo = typeof(System.Management.Automation.Cmdlet).GetField("_parameterSetName", BindingFlags.Instance | BindingFlags.NonPublic);
 
         private static readonly FieldInfo sessionStateFieldInfo = typeof(InternalCommand).GetField("state", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -40,7 +43,7 @@ internal static class PSCmdletReflectionHelper
 
         private static readonly MethodInfo endProcessingMethodInfo = psCmdletType.GetMethod("EndProcessing", BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static readonly MethodInfo processRecordMethodInfo = psCmdletType.GetMethod("ProcessRecord", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly MethodInfo processRecordMethodInfo = azurePsCmdletType.GetMethod("ExecuteCmdlet", BindingFlags.Public | BindingFlags.Instance);
 
         private static readonly object[] emptyParameters = new object[0];
 

src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs

@@ -381,16 +381,11 @@ internal string GetDefaultEndPointDomain()
             return Resources.DefaultStorageEndPointDomain;
         }
 
-        protected override void ProcessRecord()
-        {
-            ExecuteCmdlet();
-        }
-
         /// <summary>
         /// Execute command
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        public virtual void ExecuteCmdlet()
+        public override void ExecuteCmdlet()
         {
             CloudStorageAccount account = null;
             bool useHttps = (StorageNouns.HTTPS.ToLower() == protocolType.ToLower());

src/Common/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs

@@ -106,16 +106,10 @@ protected void DoInitChannelCurrentSubscription(bool force)
             }
         }
 
-        public virtual void ExecuteCmdlet()
-        {
-        }
-
-
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             Validate.ValidateInternetConnection();
             InitChannelCurrentSubscription();
-            ExecuteCmdlet();
        }
 
 

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

@@ -263,5 +263,4 @@
   </ItemGroup>
   <ItemGroup />
   <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>

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/AzureApiManagementCmdletBase.cs

@@ -45,7 +45,7 @@ public ApiManagementClient Client
 
         public abstract void ExecuteApiManagementCmdlet();
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             try
             {

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

@@ -205,5 +205,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <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>

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

@@ -234,5 +234,4 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <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>

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/AddAzureApiManagementRegion.cs

@@ -58,7 +58,7 @@ public class AddAzureApiManagementRegion : AzureApiManagementCmdletBase
             HelpMessage = "Virtual network configuration. Default value is $null.")]
         public PsApiManagementVirtualNetwork VirtualNetwork { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteCmdLetWrap(
                 () =>

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/BackupAzureApiManagement.cs

@@ -63,7 +63,7 @@ public class BackupAzureApiManagement : AzureApiManagementCmdletBase
             HelpMessage = "Sends backed up PsApiManagement to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteLongRunningCmdletWrap(
                 () => Client.BeginBackupApiManagement(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/GetAzureApiManagement.cs

@@ -45,7 +45,7 @@ public class GetAzureApiManagement : AzureApiManagementCmdletBase
             HelpMessage = "Name of API Management service.")]
         public string Name { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             if (!string.IsNullOrEmpty(ResourceGroupName) && !string.IsNullOrEmpty(Name))
             {

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/GetAzureApiManagementSsoToken.cs

@@ -33,7 +33,7 @@ public class GetAzureApiManagementSsoToken : AzureApiManagementCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteCmdLetWrap(
                 () => Client.GetSsoToken(ResourceGroupName, Name),

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/ImportAzureApiManagementHostnameCertificate.cs

@@ -59,7 +59,7 @@ public class ImportAzureApiManagementHostnameCertificate : AzureApiManagementCmd
             HelpMessage = "Sends imported PsApiManagementHostnameCertificate to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteCmdLetWrap(() =>
                 Client.UploadCertificate(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagement.cs

@@ -74,7 +74,7 @@ public class NewAzureApiManagement : AzureApiManagementCmdletBase
             HelpMessage = "Tags dictionary.")]
         public Dictionary<string, string> Tags { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteLongRunningCmdletWrap(
                 () => Client.BeginCreateApiManagementService(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementHostnameConfiguration.cs

@@ -36,7 +36,7 @@ public class NewAzureApiManagementHostnameConfiguration : AzureRMCmdlet
         [ValidateNotNullOrEmpty]
         public string Hostname { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             WriteObject(
                 new PsApiManagementHostnameConfiguration

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementVirtualNetwork.cs

@@ -50,7 +50,7 @@ public class NewAzureApiManagementVirtualNetwork : AzureRMCmdlet
         [ValidateNotNullOrEmpty]
         public Guid VnetId { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             WriteObject(
                 new PsApiManagementVirtualNetwork

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/RemoveAzureApiManagement.cs

@@ -44,7 +44,7 @@ public class RemoveAzureApiManagement : AzureApiManagementCmdletBase
         [Parameter(HelpMessage = "Do not confirm on the removal of the API Management service.")]
         public SwitchParameter Force { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var actionDescription = string.Format(
                     CultureInfo.CurrentCulture,

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/RemoveAzureApiManagementRegion.cs

@@ -38,7 +38,7 @@ public class RemoveAzureApiManagementRegion : AzureApiManagementCmdletBase
             "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteCmdLetWrap(
                 () =>

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/RestoreAzureApiManagement.cs

@@ -64,7 +64,7 @@ public class RestoreAzureApiManagement : AzureApiManagementCmdletBase
             HelpMessage = "Sends restored PsApiManagement to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteLongRunningCmdletWrap(
                 () => Client.BeginRestoreApiManagement(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/SetAzureApiManagementHostnames.cs

@@ -65,7 +65,7 @@ public class SetAzureApiManagementHostnames : AzureApiManagementCmdletBase
             HelpMessage = "Sends updated PsApiManagement to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             string resourceGroupName, name;
             PsApiManagementHostnameConfiguration portalHostName, proxyHostName;

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/SetAzureApiManagementVirtualNetworks.cs

@@ -44,7 +44,7 @@ public class SetAzureApiManagementVirtualNetworks : AzureApiManagementCmdletBase
             HelpMessage = "Sends updated PsApiManagement to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteLongRunningCmdletWrap(
                 () => Client.BeginManageVirtualNetworks(ResourceGroupName, Name, VirtualNetworks),

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementDeployment.cs

@@ -92,7 +92,7 @@ public class UpdateAzureApiManagementDeployment : AzureApiManagementCmdletBase
             HelpMessage = "Sends updated PsApiManagement to pipeline if operation succeeds.")]
         public SwitchParameter PassThru { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             string resourceGroupName, name, location;
             PsApiManagementSku sku;

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementRegion.cs

@@ -59,7 +59,7 @@ public class UpdateAzureApiManagementRegion : AzureApiManagementCmdletBase
                           "Passing $null will remove virtual network configuration for the region.")]
         public PsApiManagementVirtualNetwork VirtualNetwork { get; set; }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             ExecuteCmdLetWrap(
                 () =>

src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj

@@ -242,5 +242,4 @@
     </None>
   </ItemGroup>
   <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>

src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj

@@ -197,5 +197,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\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>

src/ResourceManager/Automation/Commands.Automation/Cmdlet/AzureAutomationBaseCmdlet.cs

@@ -74,7 +74,7 @@ protected virtual void AutomationProcessRecord()
             // Do nothing.
         }
 
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             try
             {

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ExportAzureAutomationDscConfiguration.cs

@@ -70,7 +70,7 @@ public SwitchParameter Force
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             bool? isDraft = this.IsDraft();
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ExportAzureAutomationDscNodeReportContent.cs

@@ -69,7 +69,7 @@ public SwitchParameter Force
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var ret = this.AutomationClient.GetDscNodeReportContent(this.ResourceGroupName, this.AutomationAccountName, this.NodeId, this.ReportId, OutputFolder, overwriteExistingFile);
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationAccount.cs

@@ -68,7 +68,7 @@ public IAutomationClient AutomationClient
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             IEnumerable<AutomationAccount> ret = null;
             if (this.ParameterSetName == AutomationCmdletParameterSets.ByAutomationAccountName)

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationAgentRegistrationInformation.cs

@@ -32,7 +32,7 @@ public class GetAzureAutomationRegistrationInfo : AzureAutomationBaseCmdlet
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             IEnumerable<AgentRegistration> ret = null;
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationConfiguration.cs

@@ -40,7 +40,7 @@ public class GetAzureAutomationDscConfiguration : AzureAutomationBaseCmdlet
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             IEnumerable<DscConfiguration> ret = null;
             if (this.ParameterSetName == AutomationCmdletParameterSets.ByConfigurationName)

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscNode.cs

@@ -70,7 +70,7 @@ public class GetAzureAutomationDscNode : AzureAutomationBaseCmdlet
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             IEnumerable<DscNode> ret = null;
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscNodeReport.cs

@@ -69,7 +69,7 @@ public SwitchParameter Latest
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             IEnumerable<DscNodeReport> ret = null;
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/GetAzureAutomationDscOnboardingMetaconfig.cs

@@ -63,7 +63,7 @@ public SwitchParameter Force
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             this.ConfirmAction(
                 this.Force.IsPresent,

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationDscConfiguration.cs

@@ -91,7 +91,7 @@ public SwitchParameter Force
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var configuration = this.AutomationClient.CreateConfiguration(
                     this.ResourceGroupName,

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationDscNodeConfiguration.cs

@@ -63,7 +63,7 @@ public SwitchParameter Force
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var nodeConfiguration = this.AutomationClient.CreateNodeConfiguration(
                     this.ResourceGroupName,

src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationAccount.cs

@@ -90,7 +90,7 @@ public IAutomationClient AutomationClient
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var account = this.AutomationClient.CreateAutomationAccount(this.ResourceGroupName, this.Name, this.Location, this.Plan, this.Tags);
             this.WriteObject(account);

src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationKey.cs

@@ -39,7 +39,7 @@ public class NewAzureAutomationKey : AzureAutomationBaseCmdlet
         /// Execute this cmdlet.
         /// </summary>
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
-        protected override void ProcessRecord()
+        public override void ExecuteCmdlet()
         {
             var agentRegistration = this.AutomationClient.NewAgentRegistrationKey(this.ResourceGroupName, this.AutomationAccountName, this.KeyType);
             this.WriteObject(agentRegistration);