Merge pull request #21356 from yifanz0/mergestorage

[Do Not Squash][Storage] Merge recent changes from main to Az.Storage-preview

Author: wyunchi-ms

.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/security-tools.yml

@@ -45,7 +45,7 @@ jobs:
       script: dotnet msbuild build.proj /t:"Build;GenerateHelp" /p:"PullRequestNumber=$(System.PullRequest.PullRequestNumber);IsSecurityCheck=true"
     env:
       OCTOKITPAT: $(OCTOKITPAT)
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
     displayName: Run CredScan
     condition: in(variables['system.pullRequest.targetBranch'], 'generation', 'main')
     inputs:
@@ -76,7 +76,7 @@ jobs:
       script: ./tools/CleanupBuild.ps1
       pwsh: true
 
-  - task: PoliCheck@1
+  - task: PoliCheck@2
     displayName: Run PoliCheck
     inputs:
       targetArgument: $(Build.SourcesDirectory)/artifacts/Debug