Merge pull request #22794 from Azure/nori/Az.Keyvault-preview

Sync main to keyvault preview branch

Author: BethanyZhou

.azure-pipelines/SyncFromMainBranchConfig.json

@@ -3,6 +3,7 @@
         ".ci-config.json",
         "tools",
         ".azure-pipelines",
+        ".github",
         "src/lib",
         "src/shared",
         "build.proj",

.azure-pipelines/code-gen.yml

@@ -99,6 +99,8 @@ jobs:
       $Title = "Migrate ${{ parameters.ServiceName }} from generation to ${{ parameters.TargetBranch }}"
       $HeadBranch = "codegen/${{ parameters.ServiceName }}"
       $BaseBranch = "${{ parameters.TargetBranch }}"
-      $Description = "Migrate ${{ parameters.ServiceName }} from generation to ${{ parameters.TargetBranch }}"
+      $SourceBranch = "$(Build.SourceBranch)"
+      $SourceBranch = $BaseBranch.Replace("refs/heads/", "")
+      $Description = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}"
       ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
     displayName: Create PR to main branch

.azure-pipelines/code-oob.yml

@@ -39,6 +39,7 @@ stages:
           $pattern = '(?s)## Version (\d+\.\d+\.\d)+[\s\S]*?\n(.*?)(?=\n## Version \d+\.\d+\.\d+|$)'
           $matches = [regex]::Match($mdcontent, $pattern)
           $NeedBumpUp = $true
+          $BaseBranch = "$(BranchPrefix)/${{ parameters.ServiceName }}"
           if ($matches.Success) {
               $versionNumber = $matches.Groups[1].Value
               $versionChanges = $matches.Groups[2].Value.Trim()
@@ -47,12 +48,15 @@ stages:
             $versionNumber += "-preview"
             echo "##vso[task.setvariable variable=NeedBumpUp]false"
             $NeedBumpUp = $false
+            $BaseBranch = "$(Build.SourceBranch)"
+            $BaseBranch = $BaseBranch.Replace("refs/heads/", "")
           }
           $jsonData = @{
             ModuleName = "${{ parameters.ServiceName }}"
             VersionNumber = "$versionNumber"
             VersionChanges = "$versionChanges"
             IsPreview = “${{ parameters.Preview }}“
+            BaseBranch = "$BaseBranch"
           }
           $jsonString = $jsonData | ConvertTo-Json
           $jsonString | Out-File -FilePath "VersionInfo.json"

.azure-pipelines/powershell-core.yml

@@ -1,5 +1,5 @@
 variables:
-  WindowsName: windows 
+  WindowsName: windows
   WindowsAgentPoolName: pool-windows-2019
   WindowsAgentPoolVMImage: ''
   LinuxName: linux
@@ -8,7 +8,7 @@ variables:
   MacOSName: macOS
   MacOSAgentPoolName: 'Azure Pipelines'
   MacOSAgentPoolVMImage: macOS-11
-  TestFramework: netcoreapp3.1
+  TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true
@@ -57,6 +57,7 @@ jobs:
       configuration: ${{ variables.Configuration }}
       testFramework: ${{ variables.TestFramework }}
       powerShellPlatform: ${{ variables.PowerShellPlatform }}
+      IsGenerateBased: ${{ variables.IsGenerateBased }}
 
 - job: Test
   displayName: Test

.azure-pipelines/release-test.yml

@@ -3,10 +3,6 @@ parameters:
   displayName: Windows PowerShell Version
   type: string
   default: 5.1.14
-- name: ps7
-  displayName: PowerShell 7.0.x Version
-  type: string
-  default: 7.0.*
 - name: ps7_2
   displayName: PowerShell 7.2.x Version
   type: string
@@ -52,14 +48,6 @@ jobs:
     psVersion: ${{ parameters.win_ps }}
     netCoreVersion: ${{ parameters.netCoreVersion }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'Win_PS7_0_X_SmokeTest'
-    agentPoolName: ${{ variables.winAgentPoolName }}
-    agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_PS7_2_X_SmokeTest'
@@ -92,14 +80,6 @@ jobs:
     psVersion: ${{ parameters.preview_ps }}
     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'Linux_PS7_0_X_SmokeTest'
-    agentPoolName: ${{ variables.linuxAgentPoolName }}
-    agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_PS7_2_X_SmokeTest'
@@ -132,14 +112,6 @@ jobs:
     psVersion: ${{ parameters.preview_ps }}
     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_PS7_0_X_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_PS7_2_X_SmokeTest'

.azure-pipelines/sync-aliases.yml

@@ -7,26 +7,40 @@ schedules:
     - main
 
 jobs:
-- job: UpdateJson
-  displayName: Update fabricbot.json
+- job: UpdateYaml
+  displayName: Update resourceManagement.yml
+  pool: pool-windows-2019
+
   steps:
+  - task: UseDotNet@2
+    displayName: Install .NET 7 SDK
+    inputs:
+      packageType: sdk
+      version: 7.0.x
+
+  - pwsh: |
+      dotnet --version
+      dotnet new tool-manifest --force
+      dotnet tool install powershell
+    displayName: Install Latest PowerShell (7.3+)
+
   - task: AzurePowerShell@5
     inputs:
       azureSubscription: 'Azure SDK Infrastructure'
       ScriptType: 'InlineScript'
       Inline: |
         $ADOTokenValue = Get-AzKeyVaultSecret -VaultName ${env:KEYVAULTNAME} -Name ${env:ADOTOKENNAME} -AsPlainText
-        Write-Host "##vso[task.setvariable variable=ADOToken;issecret=true]$ADOTokenValue"       
+        Write-Host "##vso[task.setvariable variable=ADOToken;issecret=true]$ADOTokenValue"
       azurePowerShellVersion: 'LatestVersion'
     displayName: Get ADOToken from Key Vault
 
   - pwsh: |
-      ./tools/Github/ParseWiki2Json.ps1 -ADOToken $(ADOToken)
-    displayName: Update fabricbot.json file locally
+      dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File "./tools/Github/ParseServiceContactsList.ps1 -ADOToken $(ADOToken)"
+    displayName: Update resourceManagement.yml file locally
 
   - pwsh: |
-      $gitStatus = git status -s
-      if (-not $gitStatus) {
+      $hasChanges = git diff --name-only .github/policies
+      if ($null -eq $hasChanges) {
           Write-Host "The wiki has no changes."
           Write-Host "##vso[task.setvariable variable=ChangesDetected]false"
       } else {
@@ -38,21 +52,21 @@ jobs:
   - pwsh: |
       git config --global user.email "[email protected]"
       git config --global user.name "azure-powershell-bot"
-      git checkout -b "internal/sync-fabricbot-json"
-        
-      git add .
-      git commit -m "Sync fabricbot.json"
-        
+      git checkout -b "internal/sync-resourcemanagement-yml"
+
+      git add .github/policies
+      git commit -m "Sync resourceManagement.yml"
+
       git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git;
-      git push origin internal/sync-fabricbot-json --force
+      git push origin internal/sync-resourcemanagement-yml --force
     displayName: Git commit and push
     condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
-  
+
   - pwsh: |
-      $Title = "Sync fabricbot.json According To ADO Wiki Page"
-      $HeadBranch = "internal/sync-fabricbot-json"
+      $Title = "Sync resourceManagement.yml according To ADO Wiki Page - Service Contact List"
+      $HeadBranch = "internal/sync-resourcemanagement-yml"
       $BaseBranch = "main"
-      $Description = "This PR sync taskType: scheduledAndTrigger part of fabricbot.json from table of Service-Team-Label-and-Contact-List in ADO wiki page"
+      $Description = "This PR synchronizes the task: 'Triage issues to the service team' part of resourceManagement.yml from table of Service Contact List in ADO wiki page"
       ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
     displayName: Create PR to main branch
     condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))

.azure-pipelines/sync-tools-folder.yml

@@ -11,8 +11,21 @@ trigger:
   paths:
     include:
       - .azure-pipelines
+      - .github
       - tools
       - src/lib
+      - .ci-config.json
+      - src/shared
+      - build.proj
+      - src/Az.props
+      - src/Az.Shared.props
+      - src/Az.Test.props
+      - src/Az.autorest.hybrid.props
+      - src/Az.autorest.hybrid.v2.props
+      - src/Az.autorest.props
+      - src/Az.Post.props
+      - src/psm1.props
+      - NuGet.Config
 
 variables:
   GenerationBranchName: generation

.azure-pipelines/test-coverage.yml

@@ -1,7 +1,4 @@
 parameters:
-- name: dotnet_sdk_3_1
-  displayName: .NET Core 3.1
-  default: 3.1.x
 - name: dotnet_sdk_6
   displayName: .NET 6
   type: string
@@ -13,7 +10,7 @@ parameters:
 - name: testFramework
   displayName: Test Framework
   type: string
-  default: netcoreapp3.1
+  default: net6.0
 - name: testPoolName
   displayName: Test Pool Name
   type: string
@@ -64,10 +61,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET Core 3.1 SDK'
+    displayName: 'Install .NET 6.0 SDK'
     inputs:
       packageType: sdk
-      version: ${{ parameters.dotnet_sdk_3_1 }}
+      version: ${{ parameters.dotnet_sdk_6 }}
 
   - task: PowerShell@2
     displayName: Initialize Environment

.azure-pipelines/util/analyze-steps.yml

@@ -2,26 +2,12 @@ parameters:
   configuration: ''
   testFramework: ''
   powerShellPlatform: ''
+  IsGenerateBased: ''
 
 steps:
 - template: download-build-steps.yml
   parameters:
     artifactName: build-${{ parameters.testFramework }}
-- task: NodeTool@0
-  condition: eq(variables.IsGenerateBased, true)
-  displayName: Install autorest
-  inputs:
-    versionSpec: '14.17.1'
-    command: custom
-    verbose: false
-    customCommand: install autorest@latest
-- task: PowerShell@2
-  condition: eq(variables.IsGenerateBased, true)
-  displayName: Setup environment for autorest
-  inputs:
-    targetType: inline
-    script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
-    pwsh: true
 
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk 6.0.x'
@@ -61,6 +47,7 @@ steps:
     arguments: 'build.proj /t:StaticAnalysis /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
   env:
       OCTOKITPAT: $(OCTOKITPAT)
+      IsGenerateBased: ${{ parameters.IsGenerateBased }}
 
 - template: publish-artifacts-steps.yml
   parameters:

.azure-pipelines/util/test-steps.yml

@@ -9,27 +9,12 @@ steps:
 - template: download-build-steps.yml
   parameters:
     artifactName: build-${{ parameters.testFramework }}
-- task: NodeTool@0
-  condition: eq(variables.IsGenerateBased, true)
-  displayName: Install Autorest
-  inputs:
-    versionSpec: '14.17.1'
-    command: custom
-    verbose: false
-    customCommand: install autorest@latest
-- task: PowerShell@2
-  condition: eq(variables.IsGenerateBased, true)
-  displayName: Setup environment for Autorest
-  inputs:
-    targetType: inline
-    script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
-    pwsh: true
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET SDK 6 for tests'
   inputs:
     packageType: sdk
-    version: 3.1.x
+    version: 6.0.x
 
 - task: PowerShell@2
   displayName: Remove pre-installed Az modules