fixed merged conflicts

Author: safeermohammed

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -129,7 +129,13 @@ CmdletsToExport = 'Get-AzureRMAutomationHybridWorkerGroup',
                'Start-AzureRmAutomationDscNodeConfigurationDeployment', 
                'Stop-AzureRmAutomationDscNodeConfigurationDeployment', 
                'Get-AzureRmAutomationDscNodeConfigurationDeploymentSchedule', 
-               'Get-AzureRmAutomationDscNodeConfigurationDeployment'
+               'Get-AzureRmAutomationDscNodeConfigurationDeployment',
+               # Update Management Cmdlets
+               'New-AzureRmAutomationSoftwareUpdateConfiguration',
+               'Get-AzureRmAutomationSoftwareUpdateConfiguration',
+               'Remove-AzureRmAutomationSoftwareUpdateConfiguration',
+               'Get-AzureRmAutomationSoftwareUpdateRun',
+               'Get-AzureRmAutomationSoftwareUpdateMachineRun'
 
 # Variables to export from this module
 # VariablesToExport = @()

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

@@ -268,9 +268,6 @@
     <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateLinuxOneTimeSUCWithDefaults.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateOneTimeSoftwareUpdateConfigurationWithDefaults.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="SessionRecords\Microsoft.Azure.Commands.ResourceManager.Automation.Test.ScenarioTests.UpdateManagement.UpdateManagementTests\CreateWindowsOneTimeSUCWithAllOption.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/ResourceManager/Automation/Commands.Automation/Common/AutomationPSClient.cs

@@ -90,14 +90,28 @@ private void SetClientIdHeader(string clientRequestId)
         public IEnumerable<Model.AutomationAccount> ListAutomationAccounts(string resourceGroupName, ref string nextLink)
         {
             Rest.Azure.IPage<AutomationManagement.Models.AutomationAccount> response;
-
-            if (string.IsNullOrEmpty(nextLink))
+            if(!string.IsNullOrWhiteSpace(resourceGroupName))
             {
-                response = this.automationManagementClient.AutomationAccount.List();
+                if(string.IsNullOrWhiteSpace(nextLink))
+                {
+                    response = this.automationManagementClient.AutomationAccount.ListByResourceGroup(resourceGroupName);
+                }
+                else
+                {
+                    response = this.automationManagementClient.AutomationAccount.ListByResourceGroupNext(nextLink);
+                }
+                
             }
             else
             {
-                response = this.automationManagementClient.AutomationAccount.ListByResourceGroupNext(nextLink);
+                if (string.IsNullOrWhiteSpace(nextLink))
+                {
+                    response = this.automationManagementClient.AutomationAccount.List();
+                }
+                else
+                {
+                    response = this.automationManagementClient.AutomationAccount.ListNext(nextLink);
+                }
             }
 
             nextLink = response.NextPageLink;

src/ResourceManager/Automation/Commands.Automation/Model/UpdateManagement/SoftwareUpdateConfiguration.cs

@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Automation.Model.UpdateManagement
     using System.Linq;
     using Sdk = Microsoft.Azure.Management.Automation.Models;
 
-    public class SoftwareUpdateConfiguration : BaseArmProperties
+    public class SoftwareUpdateConfiguration : BaseProperties
     {
         public UpdateConfiguration UpdateConfiguration { get; set; }
 
@@ -56,15 +56,13 @@ internal SoftwareUpdateConfiguration(string resourceGroupName, string automation
         {
             this.ResourceGroupName = resourceGroupName;
             this.AutomationAccountName = automationAccountName;
-            this.CreatedBy = suc.CreatedBy;
             this.CreationTime = suc.CreationTime;
             this.Description = suc.ScheduleInfo.Description;
             this.ErrorInfo = suc.Error == null ? null : new ErrorInfo
             {
                 Code = suc.Error.Code,
                 Message = suc.Error.Message
             };
-            this.LastModifiedBy = suc.LastModifiedBy;
             this.LastModifiedTime = suc.LastModifiedTime;
             this.Name = suc.Name;
             this.ProvisioningState = suc.ProvisioningState;