Merge branch 'main' into release-network-2023-02-01

Author: htippanaboya

.azure-pipelines/live-test.yml

@@ -43,6 +43,7 @@ parameters:
 variables:
   ArtifactsName: LiveTestArtifacts
   DataLocation: $(Pipeline.Workspace)/$(ArtifactsName)
+  SuppressAzurePowerShellBreakingChangeWarnings: true
 
 schedules:
 - cron: "0 19 * * *"
@@ -173,15 +174,29 @@ stages:
 
 - stage: Report
   displayName: Send Report
-  dependsOn: Test
+  condition: always()
   jobs:
   - job:
     displayName: Send Live Test Status Report
     steps:
+    - task: PowerShell@2
+      displayName: Create data location directory
+      inputs:
+        pwsh: true
+        targetType: inline
+        script:
+          New-Item -Name $(ArtifactsName) -Path $(Pipeline.Workspace) -ItemType Directory -Force
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download live test results
+      inputs:
+        buildType: 'current'
+        targetPath: $(Pipeline.Workspace)/$(ArtifactsName)
+
     - task: PowerShell@2
       displayName: Send live test report
       inputs:
         pwsh: true
         targetType: filePath
         filePath: ./tools/TestFx/Live/SendLiveTestReport.ps1
-        arguments: $(KustoServicePrincipalTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion) $(LiveTestDatabaseName) $(LiveTestTableName) $(Build.BuildId) "$(EmailServiceConnectionString)" "$(EmailFrom)" "$(EmailTo)"
+        arguments: -EmailServiceConnectionString '$(EmailServiceConnectionString)' -EmailFrom '$(EmailFrom)'

.azure-pipelines/sync-aliases.yml

@@ -1,4 +1,4 @@
-# Variable 'ADOToken' and 'BotAccessToken' was defined in the Variables tab
+# Variable 'BotAccessToken', 'KeyVaultName' and 'ADOTokenName' was defined in the Variables tab
 schedules:
 - cron: "50 15 * * *"
   displayName: 11:50 PM (UTC + 8:00) China Daily Run
@@ -10,14 +10,24 @@ jobs:
 - job: UpdateJson
   displayName: Update fabricbot.json
   steps:
+  - task: AzurePowerShell@5
+    inputs:
+      azureSubscription: 'Azure SDK Infrastructure'
+      ScriptType: 'InlineScript'
+      Inline: |
+        $ADOTokenValue = Get-AzKeyVaultSecret -VaultName ${env:KEYVAULTNAME} -Name ${env:ADOTOKENNAME} -AsPlainText
+        Write-Host "##vso[task.setvariable variable=ADOToken;issecret=true]$ADOTokenValue"       
+      azurePowerShellVersion: 'LatestVersion'
+    displayName: Get ADOToken from Key Vault
+
   - pwsh: |
       ./tools/Github/ParseWiki2Json.ps1 -ADOToken $(ADOToken)
     displayName: Update fabricbot.json file locally
-      
+
   - pwsh: |
       $gitStatus = git status -s
       if (-not $gitStatus) {
-          Write-Host "The wiki has no changes ."
+          Write-Host "The wiki has no changes."
           Write-Host "##vso[task.setvariable variable=ChangesDetected]false"
       } else {
           Write-Host "There are changes in the repository."

.azure-pipelines/test-coverage.yml

@@ -102,7 +102,7 @@ jobs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Coverage/SaveTestCoverageResult.ps1
-      arguments: CITest $(KustoServicePrincipalTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion)
+      arguments: CITest $(KustoTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion)
 
   - task: PowerShell@2
     displayName: Update Test Coverage Baseline

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

@@ -24,10 +24,10 @@ steps:
     pwsh: true
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET Core sdk 6.0.x'
   inputs:
     packageType: sdk
-    version: 3.1.x
+    version: 6.0.x
 
 - pwsh: 'Install-Module "platyPS", "PSScriptAnalyzer" -Force -Confirm:$false -Scope CurrentUser'
   displayName: 'Install PowerShell Dependencies'
@@ -64,4 +64,4 @@ steps:
 
 - template: publish-artifacts-steps.yml
   parameters:
-    artifactName: analyze-${{ parameters.testFramework }}
+    artifactName: analyze-${{ parameters.testFramework }}

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

@@ -23,25 +23,11 @@ steps:
   displayName: 'Check Ignored File'
   inputs:
     filePath: tools/CheckIgnoredFile.ps1
-
-- task: UseDotNet@2
-  displayName: 'Use .NET Core sdk 3.1.x'
-  inputs:
-    packageType: sdk
-    version: 3.1.x
-
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk 6.0.x'
   inputs:
     packageType: sdk
     version: 6.0.x
-
-- task: PowerShell@2
-  displayName: Setup global.json
-  inputs:
-    targetType: inline
-    script: "$SdkVersion=(dotnet --list-sdks | Select-String '[3,4,5].\\d.\\d{3}').Matches[0].Value; dotnet new globaljson --sdk-version $SdkVersion --force"
-    pwsh: true
 
 - task: DotNetCoreCLI@2
   displayName: Build
@@ -58,7 +44,7 @@ steps:
   condition: eq(variables.BuildAzPredictor, 'true')
   inputs:
     targetType: inline
-    script: "$SdkVersion=(dotnet --list-sdks | Select-String '6.0.\\d{3}').Matches[0].Value; dotnet new globaljson --sdk-version $SdkVersion --force;dotnet msbuild tools/Az.Tools.Predictor/build.proj /t:\"clean;build;test\""
+    script: "dotnet msbuild tools/Az.Tools.Predictor/build.proj /t:\"clean;build;test\""
     pwsh: true
   continueOnError: true
 

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

@@ -13,14 +13,15 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    condition: ne('${{ parameters.dotnetVersion }}', '')
     displayName: Install desired .NET version ${{ parameters.dotnetVersion }}
+    condition: ne('${{ parameters.dotnetVersion }}', '')
     inputs:
       packageType: sdk
       version: ${{ parameters.dotnetVersion }}
 
   - task: PowerShell@2
     displayName: Install desired Powershell version ${{ parameters.psVersion }}
+    condition: ne('${{ parameters.psVersion }}', '')
     inputs:
       pwsh: true
       targetType: filePath
@@ -29,14 +30,15 @@ jobs:
 
   - task: PowerShell@2
     displayName: Create live test data location directory
+    condition: ne(variables['skipLatest'], 'true')
     inputs:
       pwsh: true
       targetType: inline
       script:
         New-Item -Name $(ArtifactsName) -Path $(Pipeline.Workspace) -ItemType Directory -Force
 
   - task: DownloadPipelineArtifact@2
-    condition: and(succeeded(), eq(variables['GalleryName'], 'DailyBuild'), eq(variables['PipelineBuildId'], ''))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), eq(variables['GalleryName'], 'DailyBuild'), eq(variables['PipelineBuildId'], ''))
     displayName: Download latest artifacts from daily build pipeline main branch
     inputs:
       buildType: 'specific'
@@ -48,7 +50,7 @@ jobs:
       targetPath: $(Pipeline.Workspace)
 
   - task: DownloadPipelineArtifact@2
-    condition: and(succeeded(), eq(variables['GalleryName'], 'DailyBuild'), ne(variables['PipelineBuildId'], ''))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), eq(variables['GalleryName'], 'DailyBuild'), ne(variables['PipelineBuildId'], ''))
     displayName: Download specific artifacts from daily build pipeline
     inputs:
       buildType: 'specific'
@@ -60,7 +62,7 @@ jobs:
       targetPath: $(Pipeline.Workspace)
 
   - task: DownloadPipelineArtifact@2
-    condition: and(succeeded(), eq(variables['GalleryName'], 'Sign'), eq(variables['PipelineBuildId'], ''))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), eq(variables['GalleryName'], 'Sign'), eq(variables['PipelineBuildId'], ''))
     displayName: Download latest artifacts from sign pipeline internal/release branch
     inputs:
       buildType: 'specific'
@@ -72,7 +74,7 @@ jobs:
       targetPath: $(Pipeline.Workspace)
 
   - task: DownloadPipelineArtifact@2
-    condition: and(succeeded(), eq(variables['GalleryName'], 'Sign'), ne(variables['PipelineBuildId'], ''))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), eq(variables['GalleryName'], 'Sign'), ne(variables['PipelineBuildId'], ''))
     displayName: Download specific artifacts from sign pipeline
     inputs:
       buildType: 'specific'
@@ -84,7 +86,7 @@ jobs:
       targetPath: $(Pipeline.Workspace)
 
   - task: PowerShell@2
-    condition: and(succeeded(), ne(variables['GalleryName'], 'PSGallery'))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), ne(variables['GalleryName'], 'PSGallery'))
     displayName: Copy artifacts to local repository
     inputs:
       pwsh: true
@@ -97,6 +99,7 @@ jobs:
 
   - task: PowerShell@2
     displayName: Install desired Az module from $(GalleryName)
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'))
     inputs:
       pwsh: true
       targetType: filePath
@@ -105,37 +108,36 @@ jobs:
 
   - task: PowerShell@2
     displayName: Connect Azure with live test service principal
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'))
     inputs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Live/InvokeLiveTestCITask.ps1
-      arguments: -UseWindowsPowerShell ('${{ parameters.psVersion }}' -eq '5.1') -ScriptFile './tools/TestFx/Live/ConnectLiveTestServicePrincipal.ps1 $(LiveTestServicePrincipalSubscriptionId) $(LiveTestServicePrincipalTenantId) $(LiveTestServicePrincipalId) $(LiveTestServicePrincipalSecret)'
+      arguments: -UseWindowsPowerShell ('${{ parameters.psVersion }}' -eq '5.1') -ScriptFile './tools/TestFx/Live/ConnectLiveTestServicePrincipal.ps1 $(LiveTestSubscriptionId) $(LiveTestTenantId) $(LiveTestServicePrincipalId) $(LiveTestServicePrincipalSecret)'
       failOnStderr: true
     retryCountOnTaskFailure: 3
 
   - task: PowerShell@2
-    displayName: Run top E2E live scenarios
+    displayName: Run end-to-end live scenarios
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'))
     inputs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Live/InvokeLiveTestCITask.ps1
-      arguments: -UseWindowsPowerShell ('${{ parameters.psVersion }}' -eq '5.1') -ScriptFile './tools/TestFx/Live/InvokeLiveTestScenarios.ps1 -RunPlatform ${{ parameters.osType }} -RunPowerShell ${{ parameters.psVersion }} -PowerShellLatest $(PowerShellLatest) -RepoLocation $(Build.SourcesDirectory) -DataLocation $(DataLocation)'
-    retryCountOnTaskFailure: 3
+      arguments: -UseWindowsPowerShell ('${{ parameters.psVersion }}' -eq '5.1') -ScriptFile './tools/TestFx/Live/InvokeLiveTestScenarios.ps1 -OSVersion ${{ parameters.vmImage }} -RunPlatform ${{ parameters.osType }} -RunPowerShell ${{ parameters.psVersion }}'
 
   - task: PowerShell@2
     displayName: Save live test results to Kusto
-    condition: and(succeededOrFailed(), eq(variables['Build.Reason'], 'Schedule'))
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranch'], 'refs/heads/internal/release')))
     inputs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Live/SaveLiveTestResult.ps1
-      arguments: $(KustoServicePrincipalTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion) $(LiveTestDatabaseName) $(LiveTestTableName) $(DataLocation) $(Build.BuildId) ${{ parameters.vmImage }} "$(Tag)"
-      failOnStderr: true
-    retryCountOnTaskFailure: 3
+      arguments: $(KustoTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion)
 
   - task: PublishPipelineArtifact@1
     displayName: Publish live test results to pipeline artifact
+    condition: and(succeeded(), ne(variables['skipLatest'], 'true'))
     inputs:
       artifact: livetest-os-${{ parameters.vmImage }}-ps-${{ replace(parameters.psVersion, '*', 'x') }}
       targetPath: $(DataLocation)
-    condition: always()

.ci-config.json

@@ -3,7 +3,11 @@
     {
       "patterns": [
         "src/{ModuleName}/readme.md",
-        "src/{ModuleName}[a-zA-Z`.`/]*/readme.md"
+        "src/{ModuleName}/README.md",
+        "src/{ModuleName}[a-zA-Z`.`/]*/readme.md",
+        "src/{ModuleName}[a-zA-Z`.`/]*/README.md",
+        "src/{ModuleName}/*/README.md",
+        "src/{ModuleName}/*/readme.md"
       ],
       "phases": [
         "build:related-module",

.github/fabricbot.json

@@ -2856,7 +2856,7 @@
               "SecurityInsights"
             ],
             "mentionees": [
-              "amirke"
+              "nazang"
             ]
           },
           {