Resolve merge conflict in Network ChangeLog

Author: Venkata M

.azure-pipelines/sync-squad-mapping.yml

@@ -0,0 +1,79 @@
+schedules:
+- cron: "35 16 * * *"
+  displayName: 12:35 AM (UTC + 8:00) China Daily Run
+  branches:
+    include:
+    - main
+
+resources:
+  repositories:
+  - repository: SquadMappingWiki
+    type: git
+    name: internal.wiki
+
+jobs:
+- job: UpdateYaml
+  displayName: Update resourceManagement.yml with squad labels
+  pool: pool-windows-2022
+  uses:
+    repositories:
+    - SquadMappingWiki
+
+  steps:
+  - task: UseDotNet@2
+    displayName: Install .NET SDK
+    inputs:
+      packageType: sdk
+      version: 8.x
+
+  - task: NuGetAuthenticate@1
+    inputs:
+      forceReinstallCredentialProvider: false
+
+  - pwsh: |
+      dotnet --version
+      dotnet new tool-manifest --force
+      dotnet tool install powershell --version 7.4.*
+    displayName: Install PowerShell 7.4.x
+
+  - pwsh: |
+      dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File ./tools/Github/ParseSquadMappingList.ps1 -AccessToken $env:SYSTEM_ACCESSTOKEN
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    displayName: Update resourceManagement.yml via squad mapping
+    condition: succeeded()
+
+  - pwsh: |
+      $hasChanges = git diff --name-only .github/policies
+      if ($null -eq $hasChanges -or $hasChanges.Count -eq 0) {
+          Write-Host "Squad mapping produced no changes."
+          Write-Host "##vso[task.setvariable variable=ChangesDetected]false"
+      } else {
+          Write-Host "There are changes in the repository:" $hasChanges
+          Write-Host "##vso[task.setvariable variable=ChangesDetected]true"
+      }
+    displayName: Check for changes
+
+  - template: util/get-github-pat-steps.yml
+
+  - pwsh: |
+      git config --global user.email "65331932+azure-powershell-bot@users.noreply.github.com"
+      git config --global user.name "azure-powershell-bot"
+      git checkout -b "internal/sync-squad-mapping"
+
+      git add .github/policies
+      git commit -m "Sync squad mapping to resourceManagement.yml"
+
+      git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git
+      git push origin internal/sync-squad-mapping --force
+    displayName: Git commit and push
+    condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
+
+  - pwsh: |
+      $Title = "{CI} Sync squad mapping into resourceManagement.yml"
+      $HeadBranch = "internal/sync-squad-mapping"
+      $BaseBranch = "main"
+      $Description = "This PR synchronizes squad labels, reviewers and mentionees into resourceManagement.yml based on the Squad Mapping wiki."
+      ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
+    displayName: Create PR to main branch
+    condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))

.github/policies/resourceManagement.yml

@@ -4544,5 +4544,173 @@ configuration:
       - addReply:
           reply: Hi ${contextualAuthor}, only the original author of the issue can ask that it be unresolved.  Please open a new issue with your scenario and details if you would like to discuss this topic with the team.
       description: '[Resolve Workflow] Unresolve Command Without Permissions'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-identity-squad
+      then:
+      - requestReview:
+          reviewer: act-identity-squad
+      - mentionUsers:
+          mentionees:
+          - act-identity-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-identity-squad'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-observability-squad
+      then:
+      - requestReview:
+          reviewer: act-observability-squad
+      - mentionUsers:
+          mentionees:
+          - act-observability-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-observability-squad'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-codegen-extensibility-squad
+      then:
+      - requestReview:
+          reviewer: act-codegen-extensibility-squad
+      - mentionUsers:
+          mentionees:
+          - act-codegen-extensibility-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-codegen-extensibility-squad'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-quality-productivity-squad
+      then:
+      - requestReview:
+          reviewer: act-quality-productivity-squad
+      - mentionUsers:
+          mentionees:
+          - act-quality-productivity-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-quality-productivity-squad'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-platform-engineering-squad
+      then:
+      - requestReview:
+          reviewer: act-platform-engineering-squad
+      - mentionUsers:
+          mentionees:
+          - act-platform-engineering-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-platform-engineering-squad'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-experience-enablement-squad
+      then:
+      - requestReview:
+          reviewer: act-experience-enablement-squad
+      - mentionUsers:
+          mentionees:
+          - act-experience-enablement-squad
+          replyTemplate: ':bell: Routing this PR to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Request review & mention when PR labeled act-experience-enablement-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-identity-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-identity-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-identity-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-observability-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-observability-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-observability-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-codegen-extensibility-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-codegen-extensibility-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-codegen-extensibility-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-quality-productivity-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-quality-productivity-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-quality-productivity-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-platform-engineering-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-platform-engineering-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-platform-engineering-squad'
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Labeled
+      - hasLabel:
+          label: act-experience-enablement-squad
+      then:
+      - mentionUsers:
+          mentionees:
+          - act-experience-enablement-squad
+          replyTemplate: ':bell: Routing this issue to ${mentionees}.'
+          assignMentionees: False
+      description: '[Squad Auto-Assign] Mention when issue labeled act-experience-enablement-squad'
 onFailure:
 onSuccess:

generated/CloudService/CloudService.Autorest/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@
 [assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
 [assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - CloudService")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("2.1.0")]
-[assembly: System.Reflection.AssemblyVersionAttribute("2.1.0")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("2.1.1")]
+[assembly: System.Reflection.AssemblyVersionAttribute("2.1.1")]
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 [assembly: System.CLSCompliantAttribute(false)]

generated/CloudService/CloudService.Autorest/generate-info.json

@@ -1,3 +1,3 @@
 {
-  "generate_Id": "0c134ecb-184e-4347-ac0b-b64bbaaa9e6f"
+  "generate_Id": "078e22a7-8b24-4006-889d-06c7aaa389f5"
 }

generated/CloudService/CloudService.Autorest/generated/cmdlets/GetAzCloudServiceInstanceView_Get.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.CloudService.Cmdlets
     /// [OpenAPI] GetInstanceView=>GET:"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/cloudServices/{cloudServiceName}/instanceView"
     /// </remarks>
     [global::System.Management.Automation.Cmdlet(global::System.Management.Automation.VerbsCommon.Get, @"AzCloudServiceInstanceView_Get")]
-    [Microsoft.Azure.PowerShell.Cmdlets.CloudService.Runtime.OutputBreakingChange("Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220904.ICloudServiceInstanceView", "15.0.0", "9.0.0", "2025/11/03", DeprecatedOutputProperties=new string[] {"Statuses","RoleInstanceStatusesSummary","PrivateId"}, NewOutputProperties=new string[] {"Statuses","RoleInstanceStatusesSummary","PrivateId"}, ChangeDescription="The types of the properties 'Statuses', 'RoleInstanceStatusesSummary', and 'PrivateId' will be changed from object to 'List'.")]
+    [Microsoft.Azure.PowerShell.Cmdlets.CloudService.Runtime.OutputBreakingChange("Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220904.ICloudServiceInstanceView", "16.0.0", "9.0.0", "May 2026", DeprecatedOutputProperties=new string[] {"Statuses","RoleInstanceStatusesSummary","PrivateId"}, NewOutputProperties=new string[] {"Statuses","RoleInstanceStatusesSummary","PrivateId"}, ChangeDescription="The types of the properties 'Statuses', 'RoleInstanceStatusesSummary', and 'PrivateId' will be changed from object to 'List'.")]
     [global::System.Management.Automation.OutputType(typeof(Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20220904.ICloudServiceInstanceView))]
     [global::Microsoft.Azure.PowerShell.Cmdlets.CloudService.Description(@"Gets the status of a cloud service.")]
     [global::Microsoft.Azure.PowerShell.Cmdlets.CloudService.Generated]

generated/CloudService/CloudService.Autorest/generated/cmdlets/GetAzCloudServiceNetworkInterface_Get.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.CloudService.Cmdlets
     /// [OpenAPI] GetByCloudService=>GET:"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/cloudServices/{cloudServiceName}/roleInstances/{roleInstanceName}/networkInterfaces/{networkInterfaceName}"
     /// </remarks>
     [global::System.Management.Automation.Cmdlet(global::System.Management.Automation.VerbsCommon.Get, @"AzCloudServiceNetworkInterface_Get")]
-    [Microsoft.Azure.PowerShell.Cmdlets.CloudService.Runtime.OutputBreakingChange("Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20210301.INetworkInterface", "15.0.0", "9.0.0", "2025/11/03", DeprecatedOutputProperties=new string[] {"ApplicationSecurityGroup","CustomDnsConfig","FlowLog","LoadBalancerFrontendIPConfiguration","NetworkSecurityGroupPropertiesNetworkInterface","PrivateEndpointPropertiesNetworkInterface","PrivateLinkServicePropertiesNetworkInterface","IPConfiguration","TapConfiguration","PrivateEndpointConnection","PrivateEndpointPropertiesIPConfiguration","PrivateLinkServiceConnection","ManualPrivateLinkServiceConnection","PrivateLinkServicePropertiesIPConfiguration","SecurityRule","DefaultSecurityRule","ApplicationGatewayIPConfiguration","Delegation","FlowLog","IPConfiguration","IPConfigurationProfile","NetworkInterface","PrivateEndpoint","ResourceNavigationLink","Route","DefaultSecurityRule","SecurityRule","ServiceAssociationLink","ServiceEndpointPolicy","ServiceEndpoint","NetworkSecurityGroupPropertiesSubnet","RouteTablePropertiesSubnet","IPAllocation","PropertiesAddressPrefixes","PropertiesNetworkSecurityGroupPropertiesSubnets","HostedWorkload","VisibilitySubscription","DnsSettingDnsServer","DnsSettingAppliedDnsServer","AutoApprovalSubscription","Fqdn"}, NewOutputProperties=new string[] {"ApplicationSecurityGroup","CustomDnsConfig","FlowLog","LoadBalancerFrontendIPConfiguration","NetworkSecurityGroupPropertiesNetworkInterface","PrivateEndpointPropertiesNetworkInterface","PrivateLinkServicePropertiesNetworkInterface","IPConfiguration","TapConfiguration","PrivateEndpointConnection","PrivateEndpointPropertiesIPConfiguration","PrivateLinkServiceConnection","ManualPrivateLinkServiceConnection","PrivateLinkServicePropertiesIPConfiguration","SecurityRule","DefaultSecurityRule","ApplicationGatewayIPConfiguration","Delegation","FlowLog","IPConfiguration","IPConfigurationProfile","NetworkInterface","PrivateEndpoint","ResourceNavigationLink","Route","DefaultSecurityRule","SecurityRule","ServiceAssociationLink","ServiceEndpointPolicy","ServiceEndpoint","NetworkSecurityGroupPropertiesSubnet","RouteTablePropertiesSubnet","IPAllocation","PropertiesAddressPrefixes","PropertiesNetworkSecurityGroupPropertiesSubnets","HostedWorkload","VisibilitySubscription","DnsSettingDnsServer","DnsSettingAppliedDnsServer","AutoApprovalSubscription","Fqdn"}, ChangeDescription="The types of the properties 'ApplicationSecurityGroup', 'CustomDnsConfig', 'FlowLog', 'LoadBalancerFrontendIPConfiguration', 'NetworkSecurityGroupPropertiesNetworkInterface', 'PrivateEndpointPropertiesNetworkInterface', 'PrivateLinkServicePropertiesNetworkInterface', 'IPConfiguration', 'TapConfiguration', 'PrivateEndpointConnection', 'PrivateEndpointPropertiesIPConfiguration', 'PrivateLinkServiceConnection', 'ManualPrivateLinkServiceConnection', 'PrivateLinkServicePropertiesIPConfiguration', 'SecurityRule', 'DefaultSecurityRule', 'ApplicationGatewayIPConfiguration', 'Delegation', 'FlowLog', 'IPConfiguration', 'IPConfigurationProfile', 'NetworkInterface', 'PrivateEndpoint', 'ResourceNavigationLink', 'Route', 'DefaultSecurityRule', 'SecurityRule', 'ServiceAssociationLink', 'ServiceEndpointPolicy', 'ServiceEndpoint', 'NetworkSecurityGroupPropertiesSubnet', 'RouteTablePropertiesSubnet', 'IPAllocation', 'PropertiesAddressPrefixes', 'PropertiesNetworkSecurityGroupPropertiesSubnets', 'HostedWorkload', 'VisibilitySubscription', 'DnsSettingDnsServer', 'DnsSettingAppliedDnsServer', 'AutoApprovalSubscription', 'Fqdn' will be changed from object to 'List'.")]
+    [Microsoft.Azure.PowerShell.Cmdlets.CloudService.Runtime.OutputBreakingChange("Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20210301.INetworkInterface", "16.0.0", "9.0.0", "May 2026", DeprecatedOutputProperties=new string[] {"ApplicationSecurityGroup","CustomDnsConfig","FlowLog","LoadBalancerFrontendIPConfiguration","NetworkSecurityGroupPropertiesNetworkInterface","PrivateEndpointPropertiesNetworkInterface","PrivateLinkServicePropertiesNetworkInterface","IPConfiguration","TapConfiguration","PrivateEndpointConnection","PrivateEndpointPropertiesIPConfiguration","PrivateLinkServiceConnection","ManualPrivateLinkServiceConnection","PrivateLinkServicePropertiesIPConfiguration","SecurityRule","DefaultSecurityRule","ApplicationGatewayIPConfiguration","Delegation","FlowLog","IPConfiguration","IPConfigurationProfile","NetworkInterface","PrivateEndpoint","ResourceNavigationLink","Route","DefaultSecurityRule","SecurityRule","ServiceAssociationLink","ServiceEndpointPolicy","ServiceEndpoint","NetworkSecurityGroupPropertiesSubnet","RouteTablePropertiesSubnet","IPAllocation","PropertiesAddressPrefixes","PropertiesNetworkSecurityGroupPropertiesSubnets","HostedWorkload","VisibilitySubscription","DnsSettingDnsServer","DnsSettingAppliedDnsServer","AutoApprovalSubscription","Fqdn"}, NewOutputProperties=new string[] {"ApplicationSecurityGroup","CustomDnsConfig","FlowLog","LoadBalancerFrontendIPConfiguration","NetworkSecurityGroupPropertiesNetworkInterface","PrivateEndpointPropertiesNetworkInterface","PrivateLinkServicePropertiesNetworkInterface","IPConfiguration","TapConfiguration","PrivateEndpointConnection","PrivateEndpointPropertiesIPConfiguration","PrivateLinkServiceConnection","ManualPrivateLinkServiceConnection","PrivateLinkServicePropertiesIPConfiguration","SecurityRule","DefaultSecurityRule","ApplicationGatewayIPConfiguration","Delegation","FlowLog","IPConfiguration","IPConfigurationProfile","NetworkInterface","PrivateEndpoint","ResourceNavigationLink","Route","DefaultSecurityRule","SecurityRule","ServiceAssociationLink","ServiceEndpointPolicy","ServiceEndpoint","NetworkSecurityGroupPropertiesSubnet","RouteTablePropertiesSubnet","IPAllocation","PropertiesAddressPrefixes","PropertiesNetworkSecurityGroupPropertiesSubnets","HostedWorkload","VisibilitySubscription","DnsSettingDnsServer","DnsSettingAppliedDnsServer","AutoApprovalSubscription","Fqdn"}, ChangeDescription="The types of the properties 'ApplicationSecurityGroup', 'CustomDnsConfig', 'FlowLog', 'LoadBalancerFrontendIPConfiguration', 'NetworkSecurityGroupPropertiesNetworkInterface', 'PrivateEndpointPropertiesNetworkInterface', 'PrivateLinkServicePropertiesNetworkInterface', 'IPConfiguration', 'TapConfiguration', 'PrivateEndpointConnection', 'PrivateEndpointPropertiesIPConfiguration', 'PrivateLinkServiceConnection', 'ManualPrivateLinkServiceConnection', 'PrivateLinkServicePropertiesIPConfiguration', 'SecurityRule', 'DefaultSecurityRule', 'ApplicationGatewayIPConfiguration', 'Delegation', 'FlowLog', 'IPConfiguration', 'IPConfigurationProfile', 'NetworkInterface', 'PrivateEndpoint', 'ResourceNavigationLink', 'Route', 'DefaultSecurityRule', 'SecurityRule', 'ServiceAssociationLink', 'ServiceEndpointPolicy', 'ServiceEndpoint', 'NetworkSecurityGroupPropertiesSubnet', 'RouteTablePropertiesSubnet', 'IPAllocation', 'PropertiesAddressPrefixes', 'PropertiesNetworkSecurityGroupPropertiesSubnets', 'HostedWorkload', 'VisibilitySubscription', 'DnsSettingDnsServer', 'DnsSettingAppliedDnsServer', 'AutoApprovalSubscription', 'Fqdn' will be changed from object to 'List'.")]
     [global::System.Management.Automation.OutputType(typeof(Microsoft.Azure.PowerShell.Cmdlets.CloudService.Models.Api20210301.INetworkInterface))]
     [global::Microsoft.Azure.PowerShell.Cmdlets.CloudService.Description(@"Get the specified network interface in a cloud service.")]
     [global::Microsoft.Azure.PowerShell.Cmdlets.CloudService.Generated]