Merge branch 'Azure:main' into regressiontests

Author: yifanz0

.azure-pipelines/code-gen.yml

@@ -19,8 +19,7 @@ jobs:
 - job: Job_1
   displayName: "Service: ${{ parameters.ServiceName }}"
   timeoutInMinutes: 90
-  pool:
-    name: pool-windows-2019
+  pool: pool-windows-2019
   steps:
   - checkout: self
   - task: NodeTool@0

.azure-pipelines/daily-build.yml

@@ -15,8 +15,7 @@ pr: none
 jobs:
 - job: DailyBuild
   timeoutInMinutes: 180
-  pool:
-    vmImage: 'windows-2019'
+  pool: pool-windows-2019
   steps:
   - task: PowerShell@2
     displayName: 'Initialization'
@@ -30,10 +29,10 @@ jobs:
         git clean -xdf
 
   - task: PowerShell@2
-    displayName: Prepare Powershell $(PSVersion) 
+    displayName: Prepare Powershell $(PSVersion)
     inputs:
       filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
-      arguments: '-RequiredPsVersion $(PSVersion)'      
+      arguments: '-RequiredPsVersion $(PSVersion)'
 
   - task: PowerShell@2
     displayName: 'Install platyPS'
@@ -50,7 +49,7 @@ jobs:
     inputs:
       command: custom
       custom: msbuild
-      arguments: 'build.proj /t:"Build" /p:"Configuration=Release"'
+      arguments: 'build.proj /t:"Build" /p:"Configuration=Release;TurnOnTestCoverage=true"'
 
   - task: PowerShell@2
     displayName: 'Bump Version'
@@ -61,7 +60,7 @@ jobs:
         Get-PSRepository `
         ./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' `
         Exit"
-        dotnet tool run pwsh -c $command  
+        dotnet tool run pwsh -c $command
 
   - task: PowerShell@2
     displayName: 'Clean artifacts folder'
@@ -75,7 +74,7 @@ jobs:
     inputs:
       command: custom
       custom: msbuild
-      arguments: 'build.proj /t:Build /p:Configuration=Release'
+      arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true'
 
   - task: EsrpCodeSigning@1
     inputs:
@@ -85,6 +84,7 @@ jobs:
         Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
         Release/**/Microsoft.Azure.PowerShell.*.Sdk.dll
         Release/**/Az.*.private.dll
+        Release/**/Microsoft.Azure.PowerShell.AssemblyLoading.dll
         Release/**/Microsoft.Azure.PowerShell.Authentication.dll
         Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
         Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
@@ -133,7 +133,7 @@ jobs:
       SessionTimeout: '60'
       MaxConcurrency: '50'
       MaxRetryAttempts: '5'
-  
+
   - task: EsrpCodeSigning@1
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:

.azure-pipelines/live-test.yml

@@ -0,0 +1,128 @@
+parameters:
+- name: win_image
+  displayName: Windows Image Version
+  type: string
+  default: windows-2019
+- name: linux_image
+  displayName: Linux Image Version
+  type: string
+  default: ubuntu-20.04
+- name: macOS_image
+  displayName: MacOS Image Version
+  type: string
+  default: macOS-11
+- name: win_ps_5_1
+  displayName: Windows PowerShell 5.1 Version
+  type: string
+  default: 5.1
+- name: ps_7_0_x
+  displayName: PowerShell 7.0.x Version
+  type: string
+  default: 7.0.13
+- name: ps_7_1_x
+  displayName: PowerShell 7.1.x Version
+  type: string
+  default: 7.1.7
+- name: ps_7_2_x
+  displayName: PowerShell 7.2.x Version
+  type: string
+  default: 7.2.7
+- name: ps_latest
+  displayName: PowerShell Latest Version
+  type: string
+  default: latest
+- name: dotnet_sdk_6
+  displayName: .NET 6 SDK Version
+  type: string
+  default: 6.0.x
+- name: dotnet_sdk_7
+  displayName: .NET 7 SDK Version
+  type: string
+  default: 7.0.x
+
+variables:
+  LiveTestArtifactsName: LiveTestArtifacts
+  LiveTestDataLocation: $(Pipeline.Workspace)/$(LiveTestArtifactsName)
+  EnableTestCoverage: true
+  TestCoverageLocation: $(LiveTestDataLocation)
+
+pr: none
+trigger: none
+
+jobs:
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'win_ps_5_1'
+    vmImage: ${{ parameters.win_image }}
+    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 }}
+    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 }}
+    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 }}
+    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 }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_0_x_linux'
+    vmImage: ${{ parameters.linux_image }}
+    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 }}
+    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 }}
+    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 }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+
+- template: util/live-test-steps.yml
+  parameters:
+    name: 'ps_7_2_x_macOS'
+    vmImage: ${{ parameters.macOS_image }}
+    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 }}
+    dotnetVersion: ${{ parameters.dotnet_sdk_7 }}

.azure-pipelines/powershell-core.yml

@@ -1,10 +1,13 @@
 variables:
-  WindowsName: windows
-  WindowsImage: windows-2019
+  WindowsName: windows 
+  WindowsAgentPoolName: pool-windows-2019
+  WindowsAgentPoolVMImage: ''
   LinuxName: linux
-  LinuxImage: ubuntu-20.04
+  LinuxAgentPoolName: pool-ubuntu-2004
+  LinuxAgentPoolVMImage: ''
   MacOSName: macOS
-  MacOSImage: macOS-11
+  MacOSAgentPoolName: 'Azure Pipelines'
+  MacOSAgentPoolVMImage: macOS-11
   TestFramework: netcoreapp3.1
   TestTarget: Test
   Configuration: Debug
@@ -14,6 +17,9 @@ variables:
   AnalysisTimeoutInMinutes: 120
   TestTimeoutInMinutes: 180
   BuildAzPredictor: false
+  EnableTestCoverage: true
+  TestCoverageLocation: $(Build.SourcesDirectory)/artifacts
+  PowerShellPlatform: PowerShell Core
 
 trigger: none
 
@@ -29,40 +35,28 @@ jobs:
   displayName: Build
   condition: succeeded()
   timeoutInMinutes: ${{ variables.BuildTimeoutInMinutes }}
-  strategy:
-    matrix:
-      windows:
-        OSName: ${{ variables.WindowsName }}
-        ImageName: ${{ variables.WindowsImage }}
-  pool:
-    vmImage: $(ImageName)
+  pool: pool-windows-2019
 
   steps:
   - template: util/build-steps.yml
     parameters:
-      osName: $(OSName)
       configuration: ${{ variables.Configuration }}
       testFramework: ${{ variables.TestFramework }}
+      powerShellPlatform: ${{ variables.PowerShellPlatform }}
 
 - job: Analyze
   displayName: Analyze
   dependsOn: Build
   condition: succeeded()
   timeoutInMinutes: ${{ variables.AnalysisTimeoutInMinutes }}
-  strategy:
-    matrix:
-      windows:
-        OSName: ${{ variables.WindowsName }}
-        ImageName: ${{ variables.WindowsImage }}
-  pool:
-    vmImage: $(ImageName)
+  pool: pool-windows-2019
 
   steps:
   - template: util/analyze-steps.yml
     parameters:
-      osName: $(OSName)
       configuration: ${{ variables.Configuration }}
       testFramework: ${{ variables.TestFramework }}
+      powerShellPlatform: ${{ variables.PowerShellPlatform }}
 
 - job: Test
   displayName: Test
@@ -73,15 +67,19 @@ jobs:
     matrix:
       windows:
         OSName: ${{ variables.WindowsName }}
-        ImageName: ${{ variables.WindowsImage }}
+        agentPoolName: ${{ variables.WindowsAgentPoolName }}
+        agentPoolVMImage: ${{ variables.WindowsAgentPoolVMImage }}
       linux:
         OSName: ${{ variables.LinuxName }}
-        ImageName: ${{ variables.LinuxImage }}
+        agentPoolName: ${{ variables.LinuxAgentPoolName }}
+        agentPoolVMImage: ${{ variables.LinuxAgentPoolVMImage }}
       macOS:
         OSName: ${{ variables.MacOSName }}
-        ImageName: ${{ variables.MacOSImage }}
+        agentPoolName: ${{ variables.MacOSAgentPoolName }}
+        agentPoolVMImage: ${{ variables.MacOSAgentPoolVMImage }}
   pool:
-    vmImage: $(ImageName)
+    name: $(agentPoolName)
+    vmImage: $(agentPoolVMImage)
 
   steps:
   - template: util/test-steps.yml
@@ -90,3 +88,4 @@ jobs:
       testFramework: ${{ variables.TestFramework }}
       testTarget: ${{ variables.TestTarget }}
       configuration: ${{ variables.Configuration }}
+      powerShellPlatform: ${{ variables.PowerShellPlatform }}