Fix RunCommand cmdlet

Author: hyonholee

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineRunCommandTests.ps1

@@ -103,12 +103,9 @@ function Test-VirtualMachineSetRunCommand
 
         $param = @{"first" = "var1";"second" = "var2"};
 
-        #$path = 'F:\hylee-ps\run\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\ScenarioTests\test.ps1'
         $path = 'ScenarioTests\test.ps1';
 
-        $result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId;
-        #$result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param;
-        #$vm | Invoke-AzureRmVMRunCommand -CommandId $commandId -ScriptPath $path -Parameter $param;
+        $result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param;
         $result_output = $result | Out-String;
 
         # Remove All VMs

src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs

@@ -132,12 +132,8 @@ protected override void ProcessRecord()
                         parameters.Script = new List<string>();
                         PathIntrinsics currentPath = SessionState.Path;
                         var filePath = new System.IO.FileInfo(currentPath.GetUnresolvedProviderPathFromPSPath(this.ScriptPath.ToString()));
-                        string line;
-                        var file = new System.IO.StreamReader(filePath.FullName);
-                        while ((line = file.ReadLine()) != null)
-                        {
-                            parameters.Script.Add(line);
-                        }
+                        string fileContent = WindowsAzure.Commands.Common.FileUtilities.DataStore.ReadFileAsText(filePath.FullName);
+                        parameters.Script = fileContent.Split(new string[] { "\r\n", "\n", "\r" }, StringSplitOptions.RemoveEmptyEntries);
                     }
                     if (this.Parameter != null)
                     {
@@ -192,7 +188,7 @@ protected override void ProcessRecord()
         [Parameter(
             Mandatory = false)]
         [AllowNull]
-        public System.IO.FileInfo ScriptPath { get; set; }
+        public string ScriptPath { get; set; }
 
         [Parameter(
             Mandatory = false)]

src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineRunCommand/VirtualMachineRunCommandGetMethod.cs

@@ -19,6 +19,7 @@
 // Changes to this file may cause incorrect behavior and will be lost if the
 // code is regenerated.
 
+using AutoMapper;
 using Microsoft.Azure.Commands.Compute.Automation.Models;
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
@@ -118,11 +119,12 @@ protected PSArgument[] CreateVirtualMachineRunCommandGetParameters()
     }
 
     [Cmdlet(VerbsCommon.Get, "AzureRmVMRunCommandDocument", DefaultParameterSetName = "DefaultParameter")]
-    [OutputType(typeof(RunCommandDocument))]
+    [OutputType(typeof(PSRunCommandDocument))]
     public partial class GetAzureRmVMRunCommandDocument : ComputeAutomationBaseCmdlet
     {
         protected override void ProcessRecord()
         {
+            AutoMapper.Mapper.AddProfile<ComputeAutomationAutoMapperProfile>();
             ExecuteClientAction(() =>
             {
                 string location = this.Location;
@@ -131,7 +133,9 @@ protected override void ProcessRecord()
                 if (!string.IsNullOrEmpty(location) && !string.IsNullOrEmpty(commandId))
                 {
                     var result = VirtualMachineRunCommandsClient.Get(location, commandId);
-                    WriteObject(result);
+                    var psObject = new PSRunCommandDocument();
+                    Mapper.Map<RunCommandDocument, PSRunCommandDocument>(result, psObject);
+                    WriteObject(psObject);
                 }
                 else if (!string.IsNullOrEmpty(location))
                 {
@@ -147,7 +151,12 @@ protected override void ProcessRecord()
                         }
                         nextPageLink = pageResult.NextPageLink;
                     }
-                    WriteObject(resultList, true);
+                    var psObject = new List<PSRunCommandDocumentBase>();
+                    foreach (var r in resultList)
+                    {
+                        psObject.Add(Mapper.Map<RunCommandDocumentBase, PSRunCommandDocumentBase>(r));
+                    }
+                    WriteObject(psObject, true);
                 }
             });
         }