Fixed merge conflict

Author: MikhailTryakhov

.azure-pipelines/code-gen.yml

@@ -0,0 +1,130 @@
+# Variable 'BotAccessToken' 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: null
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/generation
+jobs:
+- job: Job_1
+  displayName: "Service: ${{ parameters.ServiceName }}"
+  timeoutInMinutes: 90
+  pool:
+    name: pool-windows-2019
+  steps:
+  - checkout: self
+  - task: NodeTool@0
+    displayName: Use Node 14.15.5
+    inputs:
+      versionSpec: 14.15.5
+  - task: Npm@1
+    displayName: Install autorest
+    inputs:
+      command: custom
+      verbose: false
+      customCommand: install -g  autorest@latest
+  - task: PowerShell@2
+    displayName: Generate
+    inputs:
+      targetType: inline
+      script: >-
+        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest;
+
+        if ($subModuleFolders -eq $null) {
+          autorest --max-memory-size=8192;
+        } else {
+          $subModuleFolders | foreach-object { cd $_.FullName; autorest --max-memory-size=8192};
+        }
+      workingDirectory: src/${{ parameters.ServiceName }}
+
+  - task: PowerShell@2
+    displayName: Build
+    inputs:
+      targetType: inline
+      script: >-
+        $subModuleFolders =  Get-ChildItem -Directory -Filter *.Autorest;
+
+        if ($subModuleFolders -eq $null) {
+          ./build-module.ps1;
+        } else {
+          $subModuleFolders | foreach-object { cd $_.FullName; ./build-module.ps1; cd ..}
+        }
+
+        mkdir ../../artifacts/src/${{ parameters.ServiceName }};
+
+        cp -r ./* ../../artifacts/src/${{ parameters.ServiceName }};
+      pwsh: true
+      workingDirectory: src/${{ parameters.ServiceName }}
+  - task: PowerShell@2
+    displayName: Checkout main branch
+    inputs:
+      targetType: inline
+      script: >-
+        if ((Test-Path src/${{ parameters.ServiceName }}))
+        {
+          rm -r src/${{ parameters.ServiceName }};
+        }
+        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: |
+      $Headers = @{"Accept" = "application/vnd.github+json"; "Authorization" = "Bearer $(BotAccessToken)"}
+      $PrBody = @'
+      <!-- DO NOT DELETE THIS TEMPLATE -->
+
+      ## Description
+
+      <!-- Please add a brief description of the changes made in this PR. If you have an ongoing or finished cmdlet design, please paste the link below. -->
+
+      ## Checklist
+
+      - [x] Check this box to confirm: **I have read the [_Submitting Changes_](../blob/main/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/main/CONTRIBUTING.md) and reviewed the following information:**
+
+      * **SHOULD** select appropriate branch. Cmdlets from Autorest.PowerShell should go to [`generation`](https://github.com/Azure/azure-powershell/tree/generation) branch. 
+      * **SHOULD** make the title of PR clear and informative, and in the present imperative tense. 
+      * **SHOULD** update `ChangeLog.md` file(s) appropriately
+          * For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
+          * A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header in the past tense. Add changelog in description section if PR goes into [`generation`](https://github.com/Azure/azure-powershell/tree/generation) branch.
+          * Should **not** change `ChangeLog.md` if no new release is required, such as fixing test case only.
+      * **SHOULD** have approved design review for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) ([_Microsoft internal only_](../blob/main/CONTRIBUTING.md#onboarding)) with following situations
+          * Create new module from scratch
+          * Create new resource types which are not easy to conform to [Azure PowerShell Design Guidelines](../blob/main/documentation/development-docs/design-guidelines)
+          * Create new resource type which name doesn't use module name as prefix
+          * Have design question before implementation
+      * **SHOULD** regenerate markdown help files if there is cmdlet API change. [Instruction](../blob/main/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
+      * **SHOULD** have proper test coverage for changes in pull request.
+      * **SHOULD NOT** introduce [breaking changes](../blob/main/documentation/breaking-changes/breaking-changes-definition.md) in Az minor release except preview version.
+      * **SHOULD NOT** adjust version of module manually in pull request
+      '@
+      $RequestBody = @{"title" = "Migrate ${{ parameters.ServiceName }} from generation to ${{ parameters.TargetBranch }}"; "body" = $PrBody; "head" = "codegen/${{ parameters.ServiceName }}"; "base" = "${{ parameters.TargetBranch }}" }
+      Invoke-WebRequest -Uri https://api.github.com/repos/Azure/azure-powershell/pulls -method POST -Headers $Headers -Body ($RequestBody | ConvertTo-Json)
+    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

@@ -0,0 +1,76 @@
+# Variable 'IsGenerateBased' was defined in the Variables tab
+# Variable 'NugetSecurityAnalysisWarningLevel' was defined in the Variables tab
+# Variable 'OCTOKITPAT' was defined in the Variables tab
+# Cron Schedules have been converted using UTC Time Zone and may need to be updated for your location
+schedules:
+- cron: 0 4 * * 1,2,3,4,5
+  branches:
+    include:
+    - main
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/main
+jobs:
+- job: Job_1
+  displayName: Main
+  timeoutInMinutes: 120
+  pool:
+    name: pool-windows-2019
+  steps:
+  - checkout: self
+    fetchTags: false
+  - task: PowerShell@2
+    displayName: Install platyPS
+    inputs:
+      targetType: inline
+      script: Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser
+      pwsh: true
+  - task: NodeTool@0
+    displayName: Install Node 14.17.1
+    condition: eq(variables.IsGenerateBased, true)
+    inputs:
+      versionSpec: 14.17.1
+  - task: PowerShell@2
+    displayName: Install autorest
+    condition: eq(variables.IsGenerateBased, true)
+    inputs:
+      targetType: inline
+      script: npm install autorest@latest;$env:NODE_OPTIONS="--max-old-space-size=65536"
+  - task: PowerShell@2
+    displayName: Build
+    inputs:
+      targetType: inline
+      script: dotnet msbuilc 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
+    displayName: Run CredScan
+    condition: in(variables['system.pullRequest.targetBranch'], 'generation', 'main')
+    inputs:
+      toolMajorVersion: V2
+      outputFormat: sarif
+      scanFolder: SecurityTmp
+      suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
+      debugMode: false
+      folderSuppression: false
+  - task: PowerShell@2
+    displayName: Cleanup Build
+    inputs:
+      targetType: inline
+      script: ./tools/CleanupBuild.ps1
+      pwsh: true
+  - task: PoliCheck@1
+    displayName: Run PoliCheck
+    inputs:
+      targetArgument: $(Build.SourcesDirectory)/artifacts/Debug
+      result: $(Build.SourcesDirectory)/artifacts/result/PoliCheck.xml
+      optionsFTPATH: tools/SecurityTools/PoliCheckFileExtensions.xml
+  - task: PublishPipelineArtifact@0
+    displayName: Save artifacts
+    condition: succeededOrFailed()
+    inputs:
+      artifactName: artifacts
+      targetPath: artifacts
+...

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

@@ -49,13 +49,17 @@ steps:
     command: custom
     custom: msbuild
     arguments: 'build.proj /t:GenerateHelp /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
+  env:
+      OCTOKITPAT: $(OCTOKITPAT)
 
 - task: DotNetCoreCLI@2
   displayName: 'Static Analysis'
   inputs:
     command: custom
     custom: msbuild
     arguments: 'build.proj /t:StaticAnalysis /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
+  env:
+      OCTOKITPAT: $(OCTOKITPAT)
 
 - template: publish-artifacts-steps.yml
   parameters:

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

@@ -49,6 +49,8 @@ steps:
     command: custom
     custom: msbuild
     arguments: 'build.proj /t:Build /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
+  env:
+      OCTOKITPAT: $(OCTOKITPAT)
 
 - task: PowerShell@2
   displayName: Build-AzPredictor

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

@@ -36,6 +36,8 @@ steps:
     command: custom
     custom: msbuild
     arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
+  env:
+      OCTOKITPAT: $(OCTOKITPAT)
 
 - powershell: |
    Install-Module -Name Pester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck

.github/fabricbot.json

@@ -2568,7 +2568,7 @@
             ],
             "mentionees": [
               "wonner",
-              "zesluo"
+              "yanjungao718"
             ]
           },
           {

NuGet.Config

@@ -4,7 +4,7 @@
     <clear />
     <!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
     <add key="local-feed" value="tools/LocalFeed" />
-    <add key="azure-powershell" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-powershell/nuget/v3/index.json" />
+    <add key="azure-powershell" value="https://pkgs.dev.azure.com/azclitools/public/_packaging/azure-powershell/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>