Merge pull request #24766 from Azure/lnx/mergeconflict

 merge the conflicts from release branch to main branch

Author: VeryEarly

ChangeLog.md

@@ -1,3 +1,70 @@
+## 11.6.0 - April 2024
+#### General
+* Introduced secrets detection feature to safeguard sensitive data.
+
+#### Az.Accounts 2.19.0
+* Preannouncement: The default interactive login experience will change from browser based to Web Account Manager (WAM) based on supported platforms, [learn more](
+https://learn.microsoft.com/en-us/entra/msal/dotnet/acquiring-tokens/desktop-mobile/wam).
+Nothing changes of user operations. This will take effect from the release of May 21st
+* Fixed secrets detection issues.
+
+#### Az.Batch 3.6.0
+* Added new properties 'ResourceTags'  and 'UpgradePolicy' to 'PSCloudPool' and 'PSPoolSpecification'.
+* Added new property 'UpgradingOS' to 'PSNodeCounts'.
+* Added new properties 'Caching', 'DiskSizeGB', 'ManagedDisk' and 'WriteAcceleratorEnabled' to 'PSOSDisk'.
+* Added new properties 'SecurityProfile' and 'ServiceArtifactReference' to 'PSVirtualMachineConfigurations'.
+* Added new property 'ScaleSetVmResourceId' to 'PSVirtualMachineInfo'.
+
+#### Az.Cdn 3.2.0
+* Upgrade API version to 2024-02-01
+* Added support to configure rules to scrub PII values from the AFDx logs when new or update a AFDx resource.
+
+#### Az.Compute 7.3.0
+* Added cmdlet 'Invoke-AzSpotPlacementRecommender'.
+* Fixed 'Update-AzCapacityReservationGroup' to remove Subscriptions from SharingProfile.
+
+#### Az.DataProtection 2.4.0
+* Added vault tier restore and update backup instance for blobs.
+* Added CmkEnryption parameters to Get-AzDataProtectionBackupVault, New-AzDataProtectionBackupVault and Update-AzDataProtectionBackupVault cmdlets.
+* Added MUA support for DisableVaultImmutability, Restore, Stop-Protection, Suspend-backup, Disable soft delete operations.
+
+#### Az.Functions 4.0.8
+* Updated logic to populate tab completers and cache in the New-AzFunctionApp cmdlet
+
+#### Az.KeyVault 5.3.0
+* [Upcoming Breaking Change] Added breaking change warning message for parameter 'UseDefaultCVMPolicy' of 'Add-AzKeyVaultKey'.
+    - The offline fallback policy will be removed. Key creation will fail if unable to get regional default CVM SKR policy from MAA Service Discovery API.
+* Added parameter 'PolicyPath' in 'Add-AzKeyVaultCertificate' to support custom policy in the process of certificate enrollment. 
+* Upgraded the API version of merging certificate to 7.5. [#24323]
+
+#### Az.Monitor 5.2.0
+* '-Location' parameter was removed from 'Update-AzActionGroup' and 'Update-AzDataCollectionRule' because they do not support updating the location.
+
+#### Az.MySql 1.1.2
+* Fixed for various docs erroneously pointing to Postgres instead of MySQL
+
+#### Az.Network 7.5.0
+* Added cmdlet 'Convert-AzNetworkWatcherClassicConnectionMonitor' for converting a classic connection monitor to V2 connection monitor.
+
+#### Az.RecoveryServices 6.9.0
+* Added support for MUA for disabling vault Immutability, increasing RPO for policy schedule, restore, stop protection with retain data.
+* Added support for Enabling/Disabling the azure monitor and email notification alerts for site recovery in recovery services vault.
+
+#### Az.Resources 6.16.2
+* Migrated SDK generation from autorest csharp to autorest powershell.
+
+#### Az.Sql 4.14.1
+* Made 1.2 as default for MinimalTlsVersion when creating new Sql Server from Powershell
+* Fixed an existing issue with 'Set-AzSqlInstanceActiveDirectoryAdministrator'
+
+#### Az.Storage 6.2.0
+* Fixed object replication policy time format parsing issue [#24434]
+* Updated download offset and content length calculation logic for downloading files 
+    - 'Get-AzStorageFileContent'
+
+### Thanks to our community contributors
+* Danny Furnivall (@furnivall), updated checkout (#24634)
+
 ## 11.5.0 - April 2024
 #### General
 * Removed Az.DevSpaces from AzPreview, see more details at [Dev Spaces was retired on 15 May 2021](https://azure.microsoft.com/updates/azure-dev-spaces-is-retiring-on-31-october-2023/)

documentation/SyntaxChangeLog/SyntaxChangeLog-Az11.md

@@ -1,3 +1,51 @@
+## 11.6.0 - April 2024
+#### Az.Batch 3.6.0 
+* Modified cmdlet `New-AzBatchPool`
+   - Added parameters `-UpgradePolicy`, `-ResourceTag`
+#### Az.Cdn 3.2.0 
+* Modified cmdlet `New-AzFrontDoorCdnProfile`
+   - Added parameters `-LogScrubbingRule`, `-LogScrubbingState`
+* Modified cmdlet `Update-AzFrontDoorCdnProfile`
+   - Added parameters `-LogScrubbingRule`, `-LogScrubbingState`
+* Added cmdlet `New-AzFrontDoorCdnProfileLogScrubbingObject`, `New-AzFrontDoorCdnProfileScrubbingRulesObject`#### Az.Compute 7.3.0 
+, `Invoke-AzSpotPlacementRecommender`
+#### Az.DataProtection 2.4.0 
+* Modified cmdlet `Initialize-AzDataProtectionRestoreRequest`
+   - Added parameter `-PrefixMatch`
+* Modified cmdlet `New-AzDataProtectionBackupVault`
+   - Added parameters `-IdentityUserAssignedIdentity`, `-CmkEncryptionState`, `-CmkInfrastructureEncryption`, `-CmkIdentityType`, `-CmkUserAssignedIdentityId`, `-CmkEncryptionKeyUri`
+* Modified cmdlet `Remove-AzDataProtectionBackupInstance`
+   - Added parameter `-Token`
+* Modified cmdlet `Start-AzDataProtectionBackupInstanceRestore`
+   - Added parameters `-ResourceGuardOperationRequest`, `-Token`
+* Modified cmdlet `Stop-AzDataProtectionBackupInstanceProtection`
+   - Added parameters `-ResourceGuardOperationRequest`, `-Token`
+* Modified cmdlet `Suspend-AzDataProtectionBackupInstanceBackup`
+   - Added parameters `-ResourceGuardOperationRequest`, `-Token`
+* Modified cmdlet `Update-AzDataProtectionBackupVault`
+   - Added parameters `-Token`, `-EncryptionSetting`, `-ResourceGuardOperationRequest`, `-CmkEncryptionState`, `-CmkIdentityType`, `-CmkUserAssignedIdentityId`, `-CmkEncryptionKeyUri`
+   - Added parameter alias `UserAssignedIdentity` to parameter `-IdentityUserAssignedIdentity`
+* Added cmdlet `Get-AzDataProtectionBackupInstancesExtensionRouting`, `Update-AzDataProtectionBackupInstance`
+#### Az.KeyVault 5.3.0 
+* Modified cmdlet `Add-AzKeyVaultCertificate`
+   - Added parameter `-PolicyPath`
+#### Az.Monitor 5.2.0 
+* Modified cmdlet `Get-AzMetricsBatch`
+   - Changed the type of parameter `-InputObject` from `IMetricIdentity` to `IMetricdataIdentity`
+* Modified cmdlet `Update-AzActionGroup`
+   - Removed parameter `-Location`
+* Modified cmdlet `Update-AzDataCollectionRule`
+   - Removed parameter `-Location`
+#### Az.Network 7.5.0 
+* Added cmdlet `Convert-AzNetworkWatcherClassicConnectionMonitor`
+#### Az.RecoveryServices 6.9.0 
+* Modified cmdlet `New-AzRecoveryServicesVault`
+   - Added parameters `-DisableEmailNotificationsForSiteRecovery`, `-DisableAzureMonitorAlertsForAllReplicationIssue`, `-DisableAzureMonitorAlertsForAllFailoverIssue`
+* Modified cmdlet `Restore-AzRecoveryServicesBackupItem`
+   - Added parameter `-Token`
+* Modified cmdlet `Update-AzRecoveryServicesVault`
+   - Added parameters `-DisableEmailNotificationsForSiteRecovery`, `-DisableAzureMonitorAlertsForAllReplicationIssue`, `-DisableAzureMonitorAlertsForAllFailoverIssue`, `-Token`
+
 ## 11.5.0 - April 2024
 #### Az.Accounts 2.17.0 
 * Modified cmdlet `Clear-AzConfig`
@@ -122,3 +170,4 @@
 
 
 
+