Merge branch 'main' of https://github.com/Azure/azure-powershell into regressiontests

Author: yifanz7

.azure-pipelines/SyncFromMainBranchConfig.json

@@ -8,7 +8,8 @@
         "build.proj",
         "src/Az.Test.props",
         "src/Az.autorest.hybrid.props",
-        "src/psm1.props"
+        "src/psm1.props",
+        "NuGet.Config"
     ],
     "UnSyncPath": [
         ".azure-pipelines/SyncFromMainBranchConfig.json"

.azure-pipelines/code-gen.yml

@@ -1,15 +1,23 @@
-# Variable 'BaseBranch' was defined in the Variables tab
 # Variable 'BotAccessToken' was defined in the Variables tab
-# Variable 'ServiceName' was defined in the Variables tab
 # Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
+parameters:
+- name: TargetBranch
+  displayName: Branch this module will generated to
+  type: string
+  default: main
+- name: ServiceName
+  displayName: Service to generate
+  type: string
+  default: Databricks
+
 resources:
   repositories:
   - repository: self
     type: git
     ref: refs/heads/generation
 jobs:
 - job: Job_1
-  displayName: 'Service: '
+  displayName: "Service: ${{ parameters.ServiceName }}"
   timeoutInMinutes: 90
   pool:
     name: pool-windows-2019
@@ -30,66 +38,68 @@ jobs:
     inputs:
       targetType: inline
       script: >-
-        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest
+        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest;
 
         if ($subModuleFolders -eq $null) {
-          autorest --max-memory-size=8192
+          autorest --max-memory-size=8192;
         } else {
-          $subModuleFolders | foreach-object { cd $_.FullName; autorest --max-memory-size=8192}
+          $subModuleFolders | foreach-object { cd $_.FullName; autorest --max-memory-size=8192};
         }
-      pwsh: true
-      workingDirectory: src/$(ServiceName)/
+      workingDirectory: src/${{ parameters.ServiceName }}
+
   - task: PowerShell@2
     displayName: Build
-    condition: eq(variables.ServiceSubmoduleName, '')
     inputs:
       targetType: inline
       script: >-
-        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest
+        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest;
 
         if ($subModuleFolders -eq $null) {
-          ./build-module.ps1
+          ./build-module.ps1;
         } else {
           $subModuleFolders | foreach-object { cd $_.FullName; ./build-module.ps1; cd ..}
         }
 
-        mkdir ../../artifacts/src/$env:SERVICENAME
+        mkdir ../../artifacts/src/${{ parameters.ServiceName }};
 
-        cp -r ./* ../../artifacts/src/$env:SERVICENAME
+        cp -r ./* ../../artifacts/src/${{ parameters.ServiceName }};
       pwsh: true
-      workingDirectory: src/$(ServiceName)
-  - task: CmdLine@2
-    displayName: Checkout main branch
-    inputs:
-      script: >
-        RMDIR /Q/S src\%SERVICENAME%
-        git checkout src\%SERVICENAME%
-        git checkout -b codegen/%SERVICENAME% origin/%BaseBranch%
+      workingDirectory: src/${{ parameters.ServiceName }}
   - task: PowerShell@2
-    displayName: Move code to main
-    condition: eq(variables.ServiceSubmoduleName, '')
+    displayName: Checkout main branch
     inputs:
       targetType: inline
       script: >-
-        #Uninstall-Module -Name PackageManagement -AllVersions
-        Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force
-        Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force
-        Install-Module -Name Az.Accounts -Force
-        Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1
-
-        $subModuleFolders = Get-ChildItem .\artifacts\src\$env:SERVICENAME -Directory -Filter *.Autorest
-        if ($subModuleFolders -eq $null) {
-          Move-Generation2Master -SourcePath .\artifacts\src\$env:SERVICENAME -DestPath .\src\$env:SERVICENAME
-        } else {
-          Move-Generation2MasterHybrid -SourcePath .\artifacts\src\$env:SERVICENAME -DestPath .\src\$env:SERVICENAME
+        if ((Test-Path src/${{ parameters.ServiceName }}))
+        {
+          rm -r src/${{ parameters.ServiceName }};
         }
-
-        git config user.email "[email protected]"
-        git config user.name "azure-powershell-bot"
-        git add ./src
-        git add tools/CreateMappings_rules.json
-        git commit -m "Move $env:SERVICENAME to $env:BaseBranch"
-        git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git
-        git push origin codegen/$env:SERVICENAME
-      pwsh: true
-
+        git checkout src/${{ parameters.ServiceName }};
+        git checkout -b codegen/${{ parameters.ServiceName }} origin/${{ parameters.TargetBranch }};
+  - pwsh: |
+      #Uninstall-Module -Name PackageManagement -AllVersions
+      Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force;
+      Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
+      Install-Module -Name Az.Accounts -Force;
+      Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
+      $subModuleFolders = Get-ChildItem .\artifacts\src\${{ parameters.ServiceName }} -Directory -Filter *.Autorest;
+      if ($subModuleFolders -eq $null) {
+        Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
+      } else {
+        Move-Generation2MasterHybrid -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
+      }
+      git config user.email "[email protected]";
+      git config user.name "azure-powershell-bot";
+      git add ./src;
+      git add tools/CreateMappings_rules.json;
+      git commit -m "Move ${{ parameters.ServiceName }} to ${{ parameters.TargetBranch }}";
+      git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git;
+      git push origin codegen/${{ parameters.ServiceName }} --force;
+    displayName: Create codegen/${{ parameters.ServiceName }} branch
+  - pwsh: |
+      $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 }}"
+      ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
+    displayName: Create PR to main branch

.azure-pipelines/daily-build.yml

@@ -83,6 +83,7 @@ jobs:
       FolderPath: 'artifacts'
       Pattern: |
         Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
+        Release/**/Microsoft.Azure.PowerShell.*.Sdk.dll
         Release/**/Az.*.private.dll
         Release/**/Microsoft.Azure.PowerShell.Authentication.dll
         Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll

.azure-pipelines/release-test.yml

@@ -15,14 +15,18 @@ parameters:
   displayName: Windows PowerShell Version
   type: string
   default: 5.1.14
-- name: ps6
-  displayName: PowerShell 6 Version
-  type: string 
-  default: 6.2.4
 - name: ps7
-  displayName: PowerShell 7 Version
+  displayName: PowerShell 7.0.x Version
   type: string
-  default: 7.0.3
+  default: 7.0.8
+- name: ps7_1
+  displayName: PowerShell 7.1.x Version
+  type: string
+  default: 7.1.5
+- name: ps7_2
+  displayName: PowerShell 7.2.x Version
+  type: string
+  default: 7.2.0
 - name: latest_ps
   displayName: PowerShell Latest Version
   type: string
@@ -40,15 +44,21 @@ jobs:
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'Win_PS6_2_4_SmokeTest'
+    name: 'Win_PS7_0_X_SmokeTest'
     vmImage: ${{ parameters.win_image }}
-    psVersion: ${{ parameters.ps6 }}
+    psVersion: ${{ parameters.ps7 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'Win_PS7_0_3_SmokeTest'
+    name: 'Win_PS7_1_X_SmokeTest'
     vmImage: ${{ parameters.win_image }}
-    psVersion: ${{ parameters.ps7 }}
+    psVersion: ${{ parameters.ps7_1 }}
+
+- template: util/smoke-test-steps.yml
+  parameters:
+    name: 'Win_PS7_2_X_SmokeTest'
+    vmImage: ${{ parameters.win_image }}
+    psVersion: ${{ parameters.ps7_2 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
@@ -58,33 +68,33 @@ jobs:
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'Linux_PS6_2_4_SmokeTest'
+    name: 'Linux_PS7_0_X_SmokeTest'
     vmImage: ${{ parameters.linux_image }}
-    psVersion: ${{ parameters.ps6 }}
+    psVersion: ${{ parameters.ps7 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'Linux_PS7_0_3_SmokeTest'
+    name: 'Linux_PS7_1_X_SmokeTest'
     vmImage: ${{ parameters.linux_image }}
-    psVersion: ${{ parameters.ps7 }}
+    psVersion: ${{ parameters.ps7_1 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'Linux_Latest_PS_SmokeTest'
+    name: 'Linux_PS7_2_X_SmokeTest'
     vmImage: ${{ parameters.linux_image }}
-    psVersion: ${{ parameters.latest_ps }}
+    psVersion: ${{ parameters.ps7_2 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'MacOS_PS6_2_4_SmokeTest'
-    vmImage: ${{ parameters.macOS_image }}
-    psVersion: ${{ parameters.ps6 }}
+    name: 'Linux_Latest_PS_SmokeTest'
+    vmImage: ${{ parameters.linux_image }}
+    psVersion: ${{ parameters.latest_ps }}
 
 - template: util/smoke-test-steps.yml
   parameters:
-    name: 'MacOS_PS7_0_3_SmokeTest'
+    name: 'MacOS_PS7_2_X_SmokeTest'
     vmImage: ${{ parameters.macOS_image }}
-    psVersion: ${{ parameters.ps7 }}
+    psVersion: ${{ parameters.ps7_2 }}
 
 - template: util/smoke-test-steps.yml
   parameters:

.azure-pipelines/security-tools.yml

@@ -42,9 +42,9 @@ jobs:
     displayName: Build
     inputs:
       targetType: inline
-      script: dotnet msbuilc build.proj /t:"Build;GenerateHelp" /p:"PullRequestNumber=$(System.PullRequest.PullRequestNumber);IsSecurityCheck=true"
+      script: dotnet msbuild build.proj /t:"Build;GenerateHelp" /p:"PullRequestNumber=$(System.PullRequest.PullRequestNumber);IsSecurityCheck=true"
     env:
-        OCTOKITPAT: $(OCTOKITPAT)
+      OCTOKITPAT: $(OCTOKITPAT)
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
     displayName: Run CredScan
     condition: in(variables['system.pullRequest.targetBranch'], 'generation', 'main')

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

@@ -16,7 +16,6 @@ trigger:
 
 variables:
   GenerationBranchName: generation
-  AzureStackBranchName: Azs-tzl
   GithubToken: $(GITHUB_TOKEN)
 
 jobs:
@@ -27,8 +26,6 @@ jobs:
     matrix:
       Generation:
         BranchName: ${{ variables.GenerationBranchName }}
-      AzureStack:
-        BranchName: ${{ variables.AzureStackBranchName }}
 
   steps:
   - task: PowerShell@2
@@ -38,3 +35,11 @@ jobs:
       script: >-
         ./tools/SyncFromMainBranch.ps1 -BranchName $(BranchName) -GithubToken $(GithubToken)
       pwsh: true
+
+  - pwsh: |
+      $Title = "Sync tools code from main branch to $(BranchName) branch"
+      $HeadBranch = "syncToolsFolder-$(BranchName)"
+      $BaseBranch = "$(BranchName)"
+      $Description = "Migrate Sync tools code from main branch to $(BranchName) branch"
+      ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
+    displayName: Create PR to $(BranchName) branch

.azure-pipelines/util/download-build-steps.yml

@@ -3,7 +3,7 @@ parameters:
 
 steps:
 - task: DownloadPipelineArtifact@0
-  displayName: 'Download {{ parameters.artifactName }}'
+  displayName: 'Download ${{ parameters.artifactName }}'
   inputs:
     artifactName: ${{ parameters.artifactName }}
     targetPath: artifacts