Merge main into Az.DesktopVirtualization-preview (#28256)

Author: isra-fel

.azure-pipelines/PipelineSteps/BatchGeneration/analyse-modules.ps1

@@ -62,11 +62,6 @@ foreach ($moduleName in $moduleGroup) {
         {
             $FailedTasks += "UXMetadata"
         }
-        .("$toolsDirectory/ExecuteCIStep.ps1") -StaticAnalysisCmdletDiff @Parameters 2>>$ErrorLogPath
-        If (($LASTEXITCODE -ne 0) -and ($LASTEXITCODE -ne $null))
-        {
-            $FailedTasks += "CmdletDiff"
-        }
         If ($FailedTasks.Length -ne 0)
         {
             Write-Host "There are failed tasks: $FailedTasks"

.azure-pipelines/PipelineSteps/BatchGeneration/filter.ps1

@@ -15,7 +15,7 @@ $artifactsDir = Join-Path $RepoRoot 'artifacts'
 
 $changedModulesDict = @{}
 $changedSubModulesDict = @{}
-if ($env:TEST_CHANGED_MODULES_ONLY -eq "True") {
+if ($env:TEST_CHANGED_MODULES_ONLY -eq 'true') {
     Write-Host "Run test on generated folder changed modules"
     # Only generated folder change should trigger the test
     for ($i = 0; $i -lt $ChangedFiles.Count; $i++) {

.azure-pipelines/PipelineSteps/BatchGeneration/notify-failed-job.ps1

@@ -15,7 +15,10 @@ $notificationContent = $notificationTemplate -replace "{{ pipelineName }}", $pip
                                             -replace "{{ pipelineUrl }}", $pipelineUrl `
                                             -replace "{{ runUrl }}", $runUrl
 
+$notificationReceivers = if ($env:NotificationReceiversOverride -and $env:NotificationReceiversOverride -ne 'none') { $env:NotificationReceiversOverride } else { $env:FailedJobNotificationReceivers }
+Write-Host "Notification receivers: $notificationReceivers"
+
 Send-Teams `
-    -to $env:FailedJobNotificationReceivers `
+    -to $notificationReceivers `
     -title "Batch Generation Job Failed" `
     -content $notificationContent

.azure-pipelines/PipelineSteps/BatchGeneration/util.psm1

@@ -3,6 +3,15 @@ function Get-BatchGenerationModuleMap {
         [string]$srcPath
     )
     $skippedModules = $env:SKIPPED_MODULES -split ',' | ForEach-Object { $_.Trim() }
+    $selectedTargetModules = @{}
+    if ($env:SELECTED_TARGET_MODULES -ne "none") {
+        $env:SELECTED_TARGET_MODULES -split ',' | ForEach-Object {
+            $key = $_.Trim()
+            if ($key -ne '') {
+                $selectedTargetModules[$key] = $true
+            }
+        }
+    }
     $result = @{}
     $modules = Get-ChildItem -Path $srcPath -Directory
 
@@ -11,6 +20,12 @@ function Get-BatchGenerationModuleMap {
             Write-Warning "Skipping module: $($module.Name) as it is in the skipped modules list."
             continue
         }
+
+        if ($selectedTargetModules.Count -gt 0 -and -not $selectedTargetModules.ContainsKey($module.Name)) {
+            Write-Warning "Skipping module: $($module.Name) as it is not in the selected target modules list."
+            continue
+        }
+
         $subModules = Get-ChildItem -Path $module.FullName -Directory | Where-Object { 
             $_.Name -like '*.autorest'
         }

.azure-pipelines/batch-generation.yml

@@ -1,8 +1,21 @@
 parameters:
 - name: TestChangedModulesOnly
-  displayName: 'Only run tests on modules that are changed by regeneration'
+  type: boolean
+  default: true
+# Selected modules to generate, build, analyze and test
+- name: SelectedTargetModules
   type: string
-  default: 'True'
+  default: 'None'
+- name: NotificationReceiversOverride
+  type: string
+  default: 'None'
+# branch from when creating the generation branch
+- name: GenerationBaseBranch
+  type: string
+  default: 'main'
+- name: PrepareModulesOnGenerationBranch
+  type: boolean
+  default: false
 
 variables:
   IntermediateStepTimeoutInMinutes: 30
@@ -39,6 +52,22 @@ stages:
       pool: ${{ variables.WindowsAgentPoolName }}
       steps:
 
+      - task: PowerShell@2
+        name: showVariables
+        displayName: 'Show Variables'
+        inputs:
+          targetType: inline
+          pwsh: true
+          script: |
+            Write-Host "Pipeline variable SkippedModules: $($env:SkippedModules)"
+            Write-Host "Pipeline variable FailedJobNotificationReceivers: $($env:FailedJobNotificationReceivers)"
+
+            Write-Host "Parameter TestChangedModulesOnly: ${{ parameters.TestChangedModulesOnly }}"
+            Write-Host "Parameter SelectedTargetModules: ${{ parameters.SelectedTargetModules }}"
+            Write-Host "Parameter NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}"
+            Write-Host "Parameter GenerationBaseBranch: ${{ parameters.GenerationBaseBranch }}"
+            Write-Host "Parameter PrepareModulesOnGenerationBranch: ${{ parameters.PrepareModulesOnGenerationBranch }}"
+
       # TODO: (Bernard) Uncomment the no checkout step after automatically install repo into agents 
       # - checkout: none
       - checkout: self
@@ -59,7 +88,7 @@ stages:
             $token = "$(GitHubToken)"
 
             $createBranchPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'create-branch.ps1'
-            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "$(GenerationBaseBranch)" -NewBranch $generationBranch -Token $token
+            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "${{ parameters.GenerationBaseBranch }}" -NewBranch $generationBranch -Token $token
             Write-Host "##vso[task.setvariable variable=GenerationBranch;isOutput=true]$generationBranch"
 
       - task: PowerShell@2
@@ -82,10 +111,18 @@ stages:
           targetType: inline
           pwsh: true
           script: |
+            if ($env:PREPARE_MODULES_ON_GENERATION_BRANCH -eq 'true') {
+              Write-Host "Checkout to GenerationBranch: $(checkout.GenerationBranch)"
+              git fetch origin "$(checkout.GenerationBranch)"
+              git checkout "$(checkout.GenerationBranch)"
+            }
+
             $prepareModulesPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'prepare.ps1'
             & $prepareModulesPath -RepoRoot "$(Build.SourcesDirectory)" -MaxParallelJobs "${{ variables.MaxParallelGenerateJobs }}"
         env:
           SKIPPED_MODULES: $(SkippedModules)
+          SELECTED_TARGET_MODULES: ${{ parameters.SelectedTargetModules }}
+          PREPARE_MODULES_ON_GENERATION_BRANCH: ${{ parameters.PrepareModulesOnGenerationBranch }}
 
       - task: PublishPipelineArtifact@1
         displayName: 'Upload generated targets'
@@ -515,3 +552,4 @@ stages:
             env:
               TEAMS_URL: $(TEAMS_URL)
               FailedJobNotificationReceivers: $(FailedJobNotificationReceivers)
+              NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}

.azure-pipelines/sync-aliases.yml

@@ -34,11 +34,20 @@ jobs:
       dotnet tool install powershell --version 7.4.*
     displayName: Install PowerShell 7.4.x
 
+  - pwsh: |
+      if (-not (Get-PackageProvider -Name NuGet -ErrorAction SilentlyContinue)) {
+        Install-PackageProvider -Name NuGet -Force
+      }
+      Install-Package -Name YamlDotNet -RequiredVersion $(YamlDotNetVersion) -ProviderName NuGet -Force -ErrorAction Stop
+    displayName: Install YamlDotNet NuGet Package
+    retryCountOnTaskFailure: 5
+
   - pwsh: |
       dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File ./tools/Github/ParseServiceContactsList.ps1 -AccessToken $env:SYSTEM_ACCESSTOKEN
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: Update resourceManagement.yml file locally
+    condition: succeeded()
 
   - pwsh: |
       $hasChanges = git diff --name-only .github/policies

.azure-pipelines/test-coverage.yml

@@ -7,14 +7,10 @@ parameters:
   displayName: Test Framework
   type: string
   default: net8.0
-- name: testPoolName
-  displayName: Test Pool Name
-  type: string
-  default: pool-windows-2019
-- name: testPoolVMImage
-  displayName: Test Pool VM Image
-  type: string
-  default: ' '
+- name: updateBaseline
+  displayName: Update Test Coverage Baseline?
+  type: boolean
+  default: false
 
 variables:
   EnableTestCoverage: true
@@ -51,9 +47,7 @@ jobs:
 - job: TestCoverage
   dependsOn: Build
   timeoutInMinutes: 600
-  pool:
-    name: ${{ parameters.testPoolName }}
-    vmImage: ${{ parameters.testPoolVMImage }}
+  pool: pool-windows-2019
 
   steps:
   - task: UseDotNet@2
@@ -85,7 +79,7 @@ jobs:
 
   - task: PowerShell@2
     displayName: Test Autorest-Based Cmdlets
-    condition: succeeded()
+    condition: succeededOrFailed()
     inputs:
       pwsh: true
       targetType: inline
@@ -103,18 +97,20 @@ jobs:
 
   - task: PowerShell@2
     displayName: Analyze Test Coverage
-    condition: succeeded()
+    condition: succeededOrFailed()
     inputs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Coverage/AnalyzeTestCoverage.ps1
-      arguments: -CalcBaseline
+      arguments: '-CalcBaseline:$${{ parameters.updateBaseline }}'
 
   - template: util/get-github-pat-steps.yml
+    parameters:
+      execCondition: and(succeeded(), ${{ parameters.updateBaseline }})
 
   - task: PowerShell@2
     displayName: Update Test Coverage Baseline
-    condition: succeeded()
+    condition: and(succeeded(), ${{ parameters.updateBaseline }})
     inputs:
       pwsh: true
       targetType: inline

.azure-pipelines/util/get-github-pat-steps.yml

@@ -1,11 +1,17 @@
+parameters:
+- name: execCondition
+  type: string
+  default: succeeded()
+
 steps:
 - task: AzurePowerShell@5
+  displayName: Get GitHub PAT from Key Vault
+  condition: ${{ parameters.execCondition }}
   inputs:
     pwsh: true
+    azurePowerShellVersion: 'LatestVersion'
     azureSubscription: '$(AzureSubscription)'
     ScriptType: 'InlineScript'
     Inline: |
       $GithubToken = Get-AzKeyVaultSecret -VaultName $(GithubPATKeyVaultName) -Name $(GithubPATKeyVaultAccount) -AsPlainText
       Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$GithubToken"
-    azurePowerShellVersion: 'LatestVersion'
-  displayName: Get Github PAT from Key Vault

.github/policies/resourceManagement.yml

@@ -4071,6 +4071,25 @@ configuration:
             - xgithubtriage
             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: Storage Action
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Storage Action
+        then:
+        - mentionUsers:
+            mentionees:
+            - blueww
+            - sshankMSFT
+            - golddove
+            - 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:

NuGet.Config

@@ -28,6 +28,10 @@
 
 
 
+
+
+
+