Merge pull request #2810 from NonStatic2014/bugfix

Write current module version to Verbose channel.

Author: cormacpayne

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/ExportWebServiceDefinition.cs

@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.MachineLearning.Cmdlets
         WebServicesCmdletBase.CommandletSuffix, 
         SupportsShouldProcess = true)]
     [OutputType(typeof(string))]
-    public class ExportWebServiceDefinition : AzureRMCmdlet
+    public class ExportWebServiceDefinition : WebServicesCmdletBase
     {
         private const string ExportToFileParamSet = "Export to file.";
         private const string ExportToStringParamSet = "Export to JSON string.";
@@ -60,7 +60,7 @@ public class ExportWebServiceDefinition : AzureRMCmdlet
             HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void RunCmdlet()
         {
             string serializedDefinition = 
                 ModelsSerializationUtil.GetAzureMLWebServiceDefinitionJsonFromObject(this.WebService);

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/ImportWebServiceDefinition.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.MachineLearning.Cmdlets
 {
     [Cmdlet(VerbsData.Import, WebServicesCmdletBase.CommandletSuffix)]
     [OutputType(typeof(WebService))]
-    public class ImportWebServiceDefinition : AzureRMCmdlet
+    public class ImportWebServiceDefinition : WebServicesCmdletBase
     {
         private const string ImportFromFileParamSet = "Import from JSON file.";
         private const string ImportFromStringParamSet = "Import from JSON string.";
@@ -42,7 +42,7 @@ public class ImportWebServiceDefinition : AzureRMCmdlet
         [ValidateNotNullOrEmpty]
         public string JsonString { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void RunCmdlet()
         {
             string jsonDefinition = this.JsonString;
             if (string.Equals(

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/WebServicesCmdletBase.cs

@@ -82,6 +82,7 @@ protected override void BeginProcessing()
             }
             catch (Exception ex)
             {
+                this.WriteVersionInfoToDebugChannel();
                 if (this.IsFatalException(ex))
                 {
                     ThrowTerminatingError(
@@ -105,6 +106,7 @@ protected override void EndProcessing()
             }
             catch (Exception ex)
             {
+                this.WriteVersionInfoToDebugChannel();
                 if (this.IsFatalException(ex))
                 {
                     ThrowTerminatingError(
@@ -138,6 +140,7 @@ protected override void StopProcessing()
             }
             catch (Exception ex)
             {
+                this.WriteVersionInfoToDebugChannel();
                 if (this.IsFatalException(ex))
                 {
                     throw;
@@ -169,6 +172,8 @@ public override void ExecuteCmdlet()
             }
             catch (Exception ex)
             {
+               this.WriteVersionInfoToDebugChannel();
+
                 if (this.IsFatalException(ex))
                 {
                     throw;
@@ -329,5 +334,10 @@ ex is SecurityException ||
                 ex is SEHException;
         }
 
+        private void WriteVersionInfoToDebugChannel()
+        {
+            var versionInfo = this.MyInvocation.MyCommand.Module.Version;
+            this.WriteDebug(Resources.VersionInfo.FormatInvariant(versionInfo.ToString(3)));
+        }
     }
 }

src/ResourceManager/MachineLearning/Commands.MachineLearning/Resources.Designer.cs

@@ -135,4 +135,7 @@
   <data name="UpdateServiceWarning" xml:space="preserve">
     <value>Are you sure you want to update the machine learning web service "{0}" ?</value>
   </data>
+  <data name="VersionInfo" xml:space="preserve">
+    <value>Azure Machine Learning Module Version: "{0}"</value>
+  </data>
 </root>