[**URGENT**] Fix for Set-AzSqlServer and Set-AzSqlInstance cmdlets (#…

…15176)

* Fix for Set cmdlets

* comma

* update changelog.md

* Update ChangeLog.md

Co-authored-by: Dingmeng Xue <dixue@microsoft.com>

src/Sql/Sql/ChangeLog.md

@@ -20,10 +20,11 @@
 ## Upcoming Release
 * Added option to support short version of maintenance configuration id for Managed Instance in `New-AzSqlInstance` and `Set-AzSqlInstance` cmdlets
 * Added HighAvailabilityReplicaCount to `New-AzSqlDatabaseSecondary`
-* Add External Administrator and AAD Only Properties to AzSqlServer and AzSqlInstance
+* Added External Administrator and AAD Only Properties to AzSqlServer and AzSqlInstance
     - Added option to specify `-ExternalAdminName`, `-ExternalAdminSid`, `-EnableActiveDirectoryOnlyAuthentication` in `New-AzSqlInstance` and `Set-AzSqlInstance` cmdlets
     - Added option to expand external administrators information using `-ExpandActiveDirectoryAdministrator` in `Get-AzSqlServer` and `Get-AzSqlInstance` cmdlets
 * Fixed `Set-AzSqlDatabase` to no longer default ReadScale to Disabled when not specified
+* Fixed `Set-AzSqlServer` and `Set-AzSqlInstance` for partial PUT with only identity and null properties
 
 ## Version 3.1.0
 * Updated `Set-AzSqlDatabaseVulnerabilityAssessmentRuleBaseline` documentation to include example of define array of array with one inner array.

src/Sql/Sql/ManagedInstance/Cmdlet/SetAzureSqlManagedInstance.cs

@@ -290,7 +290,8 @@ protected override IEnumerable<AzureSqlManagedInstanceModel> ApplyUserInputToMod
                 Identity = model.FirstOrDefault().Identity ?? ResourceIdentityHelper.GetIdentityObjectFromType(this.AssignIdentity.IsPresent),
                 InstancePoolName = this.InstancePoolName,
                 MinimalTlsVersion = this.MinimalTlsVersion,
-                MaintenanceConfigurationId = this.MaintenanceConfigurationId
+                MaintenanceConfigurationId = this.MaintenanceConfigurationId,
+                AdministratorLogin = model.FirstOrDefault().AdministratorLogin
             });
             return updateData;
         }

src/Sql/Sql/Server/Cmdlet/SetAzureSqlServer.cs

@@ -123,6 +123,7 @@ public class SetAzureSqlServer : AzureSqlServerCmdletBase
                 Identity = model.FirstOrDefault().Identity ?? ResourceIdentityHelper.GetIdentityObjectFromType(this.AssignIdentity.IsPresent),
                 PublicNetworkAccess = this.PublicNetworkAccess,
                 MinimalTlsVersion = this.MinimalTlsVersion,
+                SqlAdministratorLogin = model.FirstOrDefault().SqlAdministratorLogin
             });
             return updateData;
         }