Merged with main, resolved conflicts

Author: MikhailTryakhov

.azure-pipelines/SyncFromMainBranchConfig.json

@@ -10,6 +10,9 @@
         "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"
     ],

.azure-pipelines/live-test.yml

@@ -1,13 +1,17 @@
 parameters:
-- name: win_image
-  displayName: Windows Image Version
+- name: img_windows_2019
+  displayName: Windows 2019 Image Version
   type: string
   default: windows-2019
-- name: linux_image
+- name: img_windows_2022
+  displayName: Windows 2022 Image Version
+  type: string
+  default: windows-2022
+- name: img_linux
   displayName: Linux Image Version
   type: string
   default: ubuntu-20.04
-- name: macOS_image
+- name: img_macos
   displayName: MacOS Image Version
   type: string
   default: macOS-11
@@ -18,15 +22,19 @@ parameters:
 - name: ps_7_0_x
   displayName: PowerShell 7.0.x Version
   type: string
-  default: 7.0.13
+  default: 7.0.*
 - name: ps_7_1_x
   displayName: PowerShell 7.1.x Version
   type: string
-  default: 7.1.7
+  default: 7.1.*
 - name: ps_7_2_x
   displayName: PowerShell 7.2.x Version
   type: string
-  default: 7.2.7
+  default: 7.2.*
+- name: ps_7_3_x
+  displayName: PowerShell 7.3.x Version
+  type: string
+  default: 7.3.*
 - name: ps_latest
   displayName: PowerShell Latest Version
   type: string
@@ -41,88 +49,161 @@ parameters:
   default: 7.0.x
 
 variables:
-  LiveTestArtifactsName: LiveTestArtifacts
-  LiveTestDataLocation: $(Pipeline.Workspace)/$(LiveTestArtifactsName)
-  EnableTestCoverage: true
-  TestCoverageLocation: $(LiveTestDataLocation)
+  ArtifactsName: LiveTestArtifacts
+  DataLocation: $(Pipeline.Workspace)/$(ArtifactsName)
+
+schedules:
+- cron: "0 19 * * *"
+  displayName: Daily Live Test
+  branches:
+    include:
+    - main
+  always: true
 
 pr: none
 trigger: none
 
 jobs:
 - template: util/live-test-steps.yml
   parameters:
-    name: 'win_ps_5_1'
-    vmImage: ${{ parameters.win_image }}
+    name: 'win_ps_5_1_win_2019'
+    vmImage: ${{ parameters.img_windows_2019 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.win_ps_5_1 }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'win_ps_5_1_win_2022'
+    vmImage: ${{ parameters.img_windows_2022 }}
+    osType: 'Windows'
     psVersion: ${{ parameters.win_ps_5_1 }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_7_0_x_win'
-    vmImage: ${{ parameters.win_image }}
+    name: 'ps_7_0_x_win_2019'
+    vmImage: ${{ parameters.img_windows_2019 }}
+    osType: 'Windows'
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_7_1_x_win'
-    vmImage: ${{ parameters.win_image }}
+    name: 'ps_7_1_x_win_2019'
+    vmImage: ${{ parameters.img_windows_2019 }}
+    osType: 'Windows'
     psVersion: ${{ parameters.ps_7_1_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_7_2_x_win'
-    vmImage: ${{ parameters.win_image }}
+    name: 'ps_7_2_x_win_2019'
+    vmImage: ${{ parameters.img_windows_2019 }}
+    osType: 'Windows'
     psVersion: ${{ parameters.ps_7_2_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_latest_win'
-    vmImage: ${{ parameters.win_image }}
-    psVersion: ${{ parameters.ps_latest }}
+    name: 'ps_7_3_x_win_2019'
+    vmImage: ${{ parameters.img_windows_2019 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.ps_7_3_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_0_x_win_2022'
+    vmImage: ${{ parameters.img_windows_2022 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.ps_7_0_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_1_x_win_2022'
+    vmImage: ${{ parameters.img_windows_2022 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.ps_7_1_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_2_x_win_2022'
+    vmImage: ${{ parameters.img_windows_2022 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.ps_7_2_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_3_x_win_2022'
+    vmImage: ${{ parameters.img_windows_2022 }}
+    osType: 'Windows'
+    psVersion: ${{ parameters.ps_7_3_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_0_x_linux'
-    vmImage: ${{ parameters.linux_image }}
+    vmImage: ${{ parameters.img_linux }}
+    osType: 'Linux'
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_1_x_linux'
-    vmImage: ${{ parameters.linux_image }}
+    vmImage: ${{ parameters.img_linux }}
+    osType: 'Linux'
     psVersion: ${{ parameters.ps_7_1_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_linux'
-    vmImage: ${{ parameters.linux_image }}
+    vmImage: ${{ parameters.img_linux }}
+    osType: 'Linux'
     psVersion: ${{ parameters.ps_7_2_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_latest_linux'
-    vmImage: ${{ parameters.linux_image }}
-    psVersion: ${{ parameters.ps_latest }}
+    name: 'ps_7_3_x_linux'
+    vmImage: ${{ parameters.img_linux }}
+    osType: 'Linux'
+    psVersion: ${{ parameters.ps_7_3_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_0_x_macOS'
+    vmImage: ${{ parameters.img_macos }}
+    osType: 'MacOS'
+    psVersion: ${{ parameters.ps_7_0_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_1_x_macOS'
+    vmImage: ${{ parameters.img_macos }}
+    osType: 'MacOS'
+    psVersion: ${{ parameters.ps_7_1_x }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_macOS'
-    vmImage: ${{ parameters.macOS_image }}
+    vmImage: ${{ parameters.img_macos }}
+    osType: 'MacOS'
     psVersion: ${{ parameters.ps_7_2_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
 - template: util/live-test-steps.yml
   parameters:
-    name: 'ps_latest_macOS'
-    vmImage: ${{ parameters.macOS_image }}
-    psVersion: ${{ parameters.ps_latest }}
+    name: 'ps_7_3_x_macOS'
+    vmImage: ${{ parameters.img_macos }}
+    osType: 'MacOS'
+    psVersion: ${{ parameters.ps_7_3_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_7 }}

.azure-pipelines/test-coverage.yml

@@ -0,0 +1,140 @@
+parameters:
+- name: windowsImage
+  displayName: Windows Image
+  type: string
+  default: windows-2019
+- name: dotnet_sdk_3_1
+  displayName: .NET Core 3.1
+  default: 3.1.x
+- name: dotnet_sdk_6
+  displayName: .NET 6
+  type: string
+  default: 6.0.x
+- name: dotnet_sdk_7
+  displayName: .NET 7
+  type: string
+  default: 7.0.x
+- name: testFramework
+  displayName: Test Framework
+  type: string
+  default: netcoreapp3.1
+
+variables:
+  EnableTestCoverage: true
+  TestCoverageLocation: $(Pipeline.Workspace)/artifacts
+
+pr: none
+trigger: none
+
+jobs:
+- job: TestCoverage
+  timeoutInMinutes: 600
+  pool:
+    vmImage: ${{ parameters.windowsImage }}
+
+  steps:
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core 3.1 SDK'
+    inputs:
+      packageType: sdk
+      version: ${{ parameters.dotnet_sdk_3_1 }}
+
+  - task: PowerShell@2
+    displayName: Initialize Environment
+    inputs:
+      pwsh: true
+      targetType: filePath
+      filePath: ./tools/TestFx/Utilities/CommonUtility.ps1
+
+  - task: DotNetCoreCLI@2
+    displayName: Build Azure PowerShell Solution
+    inputs:
+      command: custom
+      custom: msbuild
+      arguments: 'build.proj -t:"Clean;Build" -p:"Configuration=Debug"'
+
+  - task: DotNetCoreCLI@2
+    displayName: Test SDK-Based Cmdlets
+    condition: succeeded()
+    inputs:
+      command: custom
+      custom: msbuild
+      arguments: 'build.proj -t:"Test" -p:"Configuration=Debug;TestFramework=${{ parameters.testFramework }}"'
+
+  - task: PowerShell@2
+    displayName: Test AutoRest-Based Cmdlets
+    condition: succeeded()
+    inputs:
+      pwsh: true
+      workingDirectory: 'artifacts/Debug'
+      targetType: inline
+      script: |
+        Install-Module -Name Pester -RequiredVersion 4.10.1 -Force
+        Import-Module (Join-Path -Path . -ChildPath Az.Accounts | Join-Path -ChildPath Az.Accounts.psd1) -Force
+
+        $PreErrorActionPreference = $ErrorActionPreference
+        $ErrorActionPreference = "SilentlyContinue"
+
+        Get-ChildItem -Path . -Filter test-module.ps1 -File -Recurse | ForEach-Object {
+          try {
+            . $_ -Isolated
+          }
+          catch {
+            Write-Host $_.Exception
+          }
+        }
+
+        $ErrorActionPreference = $PreErrorActionPreference
+
+  - task: PowerShell@2
+    displayName: Analyze Test Coverage
+    condition: succeeded()
+    inputs:
+      pwsh: true
+      targetType: filePath
+      filePath: ./tools/TestFx/Coverage/AnalyzeTestCoverage.ps1
+      arguments: -CalcBaseline
+
+  - task: PowerShell@2
+    displayName: Save Test Coverage Results
+    condition: succeeded()
+    inputs:
+      pwsh: true
+      targetType: filePath
+      filePath: ./tools/TestFx/Coverage/SaveTestCoverageResult.ps1
+      arguments: CITest $(Build.BuildId) $(KustoServicePrincipalTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion) $(TestCoverageDatabaseName) $(TestCoverageTableName) $(TestCoverageLocation)
+
+  - task: PowerShell@2
+    displayName: Update Test Coverage Baseline
+    condition: succeeded()
+    inputs:
+      pwsh: true
+      targetType: inline
+      script: |
+        $blDir = "./tools/TestFx/Coverage"
+        $blCsv = Join-Path -Path $blDir -ChildPath "Baseline.csv"
+        if (Test-Path -Path $blCsv) {
+          Remove-Item -Path $blCsv -Force
+        }
+
+        git checkout -b testcoverage-baseline
+        Copy-Item -Path "$(Pipeline.Workspace)/artifacts/TestCoverageAnalysis/Results/Baseline.csv" -Destination $blDir
+        git config user.email "[email protected]"
+        git config user.name "azure-powershell-bot"
+        git add $blCsv
+        git commit -m "Update with the latest test coverage data"
+        git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git
+        git push origin testcoverage-baseline --force
+
+        $title = "Update test coverage baseline"
+        $headBranch = "testcoverage-baseline"
+        $targetBranch = "main"
+        $description = "Update with the latest test coverage baseline data"
+        ./tools/Github/CreatePR.ps1 -Title $title -HeadBranch $headBranch -BaseBranch $targetBranch -BotAccessToken $(BotAccessToken) -Description $description
+
+  - task: PublishPipelineArtifact@1
+    displayName: Publish Test Coverage Result
+    condition: always()
+    inputs:
+      artifact: testcoverage
+      targetPath: $(TestCoverageLocation)