resolve merge conflicts

Author: yifanz7

.azure-pipelines/PipelineSteps/analyze-steps.ps1

@@ -16,6 +16,16 @@ param (
     [string]$PowerShellPlatform
 )
 
+function Assert-ExitCodeSuccess {
+    param(
+        [string]$Operation = "Command"
+    )
+    if (($LASTEXITCODE -ne 0) -and ($LASTEXITCODE -ne $null)) {
+        Write-Error "$Operation failed with exit code $LASTEXITCODE"
+        exit $LASTEXITCODE
+    }
+}
+
 # Install PowerShell dependencies
 Write-Host -ForegroundColor Green "-------------------- Start installing PowerShell dependencies ... --------------------"
 Install-Module "platyPS", "PSScriptAnalyzer" -Repository PSGallery -Force -Confirm:$false -Scope CurrentUser
@@ -36,9 +46,11 @@ if ($PowerShellPlatform) {
 }
 $buildProjPath = Join-Path $RepoRoot 'build.proj'
 dotnet msbuild $buildProjPath /t:GenerateHelp "/p:Configuration=$Configuration"
+Assert-ExitCodeSuccess -Operation "Help generation"
 Write-Host -ForegroundColor DarkGreen "-------------------- End generating help ... --------------------`n`n`n`n`n"
 
 # Static Analysis
 Write-Host -ForegroundColor Green "-------------------- Start static analysis ... --------------------"
 dotnet msbuild $buildProjPath /t:StaticAnalysis "/p:Configuration=$Configuration"
+Assert-ExitCodeSuccess -Operation "Static analysis"
 Write-Host -ForegroundColor DarkGreen "-------------------- End static analysis ... --------------------`n`n`n`n`n"

.github/policies/resourceManagement.yml

@@ -727,6 +727,22 @@ configuration:
             - us6193
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Blob Storage SFTP
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Blob Storage SFTP
+        then:
+        - mentionUsers:
+            mentionees:
+            - greeshma-microsoft
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -1862,7 +1878,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - rgreenMSFT
+            - amarjeetkr
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2020,6 +2036,26 @@ configuration:
             - nberdy
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Device Registry
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Device Registry
+        then:
+        - mentionUsers:
+            mentionees:
+            - rohankhandelwal
+            - mryanlo
+            - atastrophic
+            - c-ryan-k
+            - digimaun
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -2051,7 +2087,6 @@ configuration:
         - mentionUsers:
             mentionees:
             - anishtrakru
-            - derekbekoe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2067,7 +2102,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - sourabhguha
+            - YingXue
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2137,6 +2172,22 @@ configuration:
             - Saglodha
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Fabric
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Fabric
+        then:
+        - mentionUsers:
+            mentionees:
+            - xinzhizou
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -3653,9 +3704,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - shariq-mcs
-            - MSFTeegarden
-            - abhijitch25
+            - abhijitch_microsoft
+            - yuvalm_microsoft
+            - nikitagarg_microsoft
+            - sanar_microsoft
+            - cawa_microsoft
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3818,10 +3871,10 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - bleroy
-            - tjacobhi
-            - markheff
-            - miwelsh
+            - kuanlu95
+            - efrainretana
+            - mattgotteiner
+            - Draconicida
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -4138,6 +4191,25 @@ configuration:
             - S-J-M
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: StorageDiscovery
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: StorageDiscovery
+        then:
+        - mentionUsers:
+            mentionees:
+            - shanefujs
+            - apurv2304
+            - skallurk
+            - vdziunms
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:

ChangeLog.md

@@ -1,3 +1,82 @@
+## 14.6.0 - November 2025
+#### Az.Compute 10.5.0
+* Added '-Redeploy' switch parameter for 'Update-AzHost' cmdlet to enable dedicated host redeployment.
+* Added '-SupportedSecurityOption' parameter to 'New-AzDiskConfig' cmdlet.
+* ComputeRP related cmdlets will now use 2025-04-01 version of the ComputeRP API.
+* Added '-AddProxyAgentExtension' parameter (Switch) to 'New-AzVmss' and 'New-AzVM'
+* Added '-AddProxyAgentExtension' parameter (Bool) to 'Set-AzVMProxyAgentSetting' and  'Set-AzVmssProxyAgentSetting'
+
+#### Az.DataProtection 2.8.0
+* Added support for AzureDataLakeStorage workload
+
+#### Az.DeviceRegistry 1.0.0
+* General availability for module Az.DeviceRegistry
+* GA stable release of API version 2025-10-01 for Az.DeviceRegistry. New updates include:
+    - Schema and Schema Version asynchronous delete. No longer synchronous.
+    - Namespace Asset and Namespace Discovered Asset EventGroups.
+    - Namespace Device x509 certificate authentication now supports intermediate certificates and key secret names.
+
+#### Az.FrontDoor 1.13.1
+* Added breaking change messages for next version
+
+#### Az.Migrate 2.10.1
+* Fixed bugs in 'Initialize-AzMigrateLocalReplicationInfrastructure'
+  - Correct AMH solution tool name of 'ServerMigration_DataReplication' is now being passed in to address replication count missing and UX experience load issues in Azure Migrate on Azure portal.
+* Address Join-Path compatibility issue in older version of PowerShell environment such as PowerShell 5.1 in the following commands
+ - 'Initialize-AzMigrateLocalReplicationInfrastructure'
+ - 'Initialize-AzMigrateReplicationInfrastructure'
+ - 'New-AzMigrateLocalServerReplication'
+ - 'Get-AzMigrateLocalServerReplication'
+ - 'Set-AzMigrateLocalServerReplication'
+ - 'Start-AzMigrateLocalServerMigration'
+
+#### Az.Network 7.23.0
+* Added 'GeoLocationXFFHeader' and 'ClientAddrXFFHeader' as valid VariableNames in 'NewAzureApplicationGatewayFirewallCustomRuleGroupByVariable'.
+* Bug fix for 'AzureFirewallPolicy' to ensure 'BasePolicy' is properly set via 'Set-AzFirewallPolicy' cmdlet either via pipe or direct value.
+
+#### Az.RecoveryServices 7.10.0
+* Added Cross region restore support for new region - northeastus5.
+* Added support for vault soft delete feature - Get soft deleted vault, Undelete softdeleted vault, Get deleted backup items in a soft deleted vault using ARG.
+
+#### Az.RedisEnterpriseCache 1.6.0
+* Added a new required property: PublicNetworkAccess for Cluster.
+* Updated the default value of AccessKeysAuthentication property for Database to 'Disabled'.
+
+#### Az.SignalR 2.3.0
+* Added cmdlets for managing replicas:
+    - Get-AzSignalRReplica: get replica(s) for SignalR
+    - New-AzSignalRReplica: create a new replica for SignalR
+    - Remove-AzSignalRReplica: remove a replica from SignalR
+    - Restart-AzSignalRReplica: restart a SignalR replica
+    - Start-AzSignalRReplica: start a SignalR replica
+    - Stop-AzSignalRReplica: stop a SignalR replica
+    - Update-AzSignalRReplica: update a SignalR replica
+* Added cmdlets for managing network IP rules
+    - New-AzSignalRNetworkIpRuleObject: create a new network IP rule object for SignalR
+    - Add-AzSignalRNetworkIpRule: add network IP rule(s) to SignalR
+    - Remove-AzSignalRNetworkIpRule: remove network IP rule(s) from SignalR
+
+#### Az.Sql 6.3.0
+* Updated with support for Immutable Long-Term Retention Backups
+    - Updated 'Set-AzSqlDatabaseBackupLongTermRetentionPolicy' cmdlet to expose 'TimeBasedImmutability' and 'TimeBasedImmutabilityMode' parameters.
+    - Updated 'AzureSqlDatabaseBackupLongTermRetentionPolicyModel' to add 'TimeBasedImmutability' and 'TimeBasedImmutabilityMode' properties.
+    - Updated 'AzureSqlDatabaseLongTermRetentionBackupModel' to add 'TimeBasedImmutability', 'TimeBasedImmutabilityMode', and 'LegalHoldImmutability' properties.
+    - Added new cmdlets 'Lock-AzSqlDatabaseLongTermRetentionBackupImmutability' and 'Remove-AzSqlDatabaseLongTermRetentionBackupImmutability' for managing time-based immutability on LTR backups.
+    - Added new cmdlets 'Set-AzSqlDatabaseLongTermRetentionBackupLegalHold' and 'Remove-AzSqlDatabaseLongTermRetentionBackupLegalHold' for managing legal hold immutability on LTR backups.
+
+#### Az.StackHCI 2.6.4
+* Fixed bug: Buse boolean in comparision
+
+#### Az.Storage 9.3.0
+* Supported Blob Geo Replication SLA on Storage accounts
+    - 'New-AzStorageAccount'
+    - 'Set-AzStorageAccount'
+* Supported enable Priority Replication when set object replication policy
+    - 'Set-AzStorageObjectReplicationPolicy'
+* Supported get and reconcile NSP Configuration on a Storage account: 
+    - 'Get-AzStorageNetworkSecurityPerimeterConfiguration'
+    - 'Invoke-AzStorageReconcileNetworkSecurityPerimeterConfiguration'
+
 ## 14.5.0 - October 2025
 #### Az.Automation 1.11.2
 * Fixed runbook_type: 'PowerShell72' [#24779][#23967]

NuGet.Config

@@ -11,39 +11,3 @@
     <clear />
   </disabledPackageSources>
 </configuration>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

documentation/Autorest-powershell-v4-new-features.md

@@ -1,4 +1,5 @@
 # Autorest PowerShell V4 Features from the End Users' Perspective
+How to migrate from Autorest PowerShell v3 to v4 please refer to [here](https://go.microsoft.com/fwlink/?linkid=2340250).
 
 ## 1. Support for piping parent object: 
     This allows users to pipe parent objects into cmdlets, simplifying commands. 

documentation/SyntaxChangeLog/SyntaxChangeLog-Az14.md

@@ -1,3 +1,41 @@
+## 14.6.0 - November 2025
+#### Az.Compute 10.5.0 
+* Modified cmdlet `New-AzDiskConfig`
+   - Added parameter `-SupportedSecurityOption`
+* Modified cmdlet `New-AzDiskUpdateConfig`
+   - Added parameter `-SupportedSecurityOption`
+* Modified cmdlet `New-AzVM`
+   - Added parameter `-AddProxyAgentExtension`
+* Modified cmdlet `New-AzVmss`
+   - Added parameter `-AddProxyAgentExtension`
+* Modified cmdlet `Set-AzVMProxyAgentSetting`
+   - Added parameter `-AddProxyAgentExtension`
+* Modified cmdlet `Set-AzVmssProxyAgentSetting`
+   - Added parameter `-AddProxyAgentExtension`
+* Modified cmdlet `Update-AzHost`
+   - Added parameter `-Redeploy`
+#### Az.RecoveryServices 7.10.0 
+* Added cmdlet `Get-AzRecoveryServicesSoftDeletedVault`, `Get-AzRecoveryServicesSoftDeletedVaultBackupItem`, `Undo-AzRecoveryServicesVaultDeletion`
+#### Az.RedisEnterpriseCache 1.6.0 
+* Modified cmdlet `New-AzRedisEnterpriseCache`
+   - Added parameter `-PublicNetworkAccess`
+* Modified cmdlet `Update-AzRedisEnterpriseCache`
+   - Added parameter `-PublicNetworkAccess`
+#### Az.SignalR 2.3.0 
+* Added cmdlet `Add-AzSignalRNetworkIpRule`, `Get-AzSignalRReplica`, `New-AzSignalRNetworkIpRuleObject`, `New-AzSignalRReplica`, `Remove-AzSignalRNetworkIpRule`, `Remove-AzSignalRReplica`, `Restart-AzSignalRReplica`, `Start-AzSignalRReplica`, `Stop-AzSignalRReplica`, `Update-AzSignalRReplica`
+#### Az.Sql 6.3.0 
+* Modified cmdlet `Set-AzSqlDatabaseBackupLongTermRetentionPolicy`
+   - Added parameters `-TimeBasedImmutability`, `-TimeBasedImmutabilityMode`
+* Added cmdlet `Lock-AzSqlDatabaseLongTermRetentionBackupImmutability`, `Remove-AzSqlDatabaseLongTermRetentionBackupImmutability`, `Remove-AzSqlDatabaseLongTermRetentionBackupLegalHold`, `Set-AzSqlDatabaseLongTermRetentionBackupLegalHold`
+#### Az.Storage 9.3.0 
+* Modified cmdlet `New-AzStorageAccount`
+   - Added parameter `-EnableBlobGeoPriorityReplication`
+* Modified cmdlet `Set-AzStorageAccount`
+   - Added parameter `-EnableBlobGeoPriorityReplication`
+* Modified cmdlet `Set-AzStorageObjectReplicationPolicy`
+   - Added parameter `-EnablePriorityReplication`
+* Added cmdlet `Get-AzStorageNetworkSecurityPerimeterConfiguration`, `Invoke-AzStorageReconcileNetworkSecurityPerimeterConfiguration`
+
 ## 14.5.0 - October 2025
 #### Az.Compute 10.4.0 
 * Modified cmdlet `Grant-AzSnapshotAccess`
@@ -741,3 +779,4 @@
 
 
 
+