Merge branch 'main' into joyer/monitor-sqr-migrate-v4

Author: JoyerJin

.azure-pipelines/PipelineSteps/BatchGeneration/analyse-modules.ps1

@@ -62,11 +62,6 @@ foreach ($moduleName in $moduleGroup) {
         {
             $FailedTasks += "UXMetadata"
         }
-        .("$toolsDirectory/ExecuteCIStep.ps1") -StaticAnalysisCmdletDiff @Parameters 2>>$ErrorLogPath
-        If (($LASTEXITCODE -ne 0) -and ($LASTEXITCODE -ne $null))
-        {
-            $FailedTasks += "CmdletDiff"
-        }
         If ($FailedTasks.Length -ne 0)
         {
             Write-Host "There are failed tasks: $FailedTasks"

.azure-pipelines/sync-aliases.yml

@@ -34,11 +34,20 @@ jobs:
       dotnet tool install powershell --version 7.4.*
     displayName: Install PowerShell 7.4.x
 
+  - pwsh: |
+      if (-not (Get-PackageProvider -Name NuGet -ErrorAction SilentlyContinue)) {
+        Install-PackageProvider -Name NuGet -Force
+      }
+      Install-Package -Name YamlDotNet -RequiredVersion $(YamlDotNetVersion) -ProviderName NuGet -Force -ErrorAction Stop
+    displayName: Install YamlDotNet NuGet Package
+    retryCountOnTaskFailure: 5
+
   - pwsh: |
       dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File ./tools/Github/ParseServiceContactsList.ps1 -AccessToken $env:SYSTEM_ACCESSTOKEN
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: Update resourceManagement.yml file locally
+    condition: succeeded()
 
   - pwsh: |
       $hasChanges = git diff --name-only .github/policies

.azure-pipelines/test-coverage.yml

@@ -7,14 +7,10 @@ parameters:
   displayName: Test Framework
   type: string
   default: net8.0
-- name: testPoolName
-  displayName: Test Pool Name
-  type: string
-  default: pool-windows-2019
-- name: testPoolVMImage
-  displayName: Test Pool VM Image
-  type: string
-  default: ' '
+- name: updateBaseline
+  displayName: Update Test Coverage Baseline?
+  type: boolean
+  default: false
 
 variables:
   EnableTestCoverage: true
@@ -51,9 +47,7 @@ jobs:
 - job: TestCoverage
   dependsOn: Build
   timeoutInMinutes: 600
-  pool:
-    name: ${{ parameters.testPoolName }}
-    vmImage: ${{ parameters.testPoolVMImage }}
+  pool: pool-windows-2019
 
   steps:
   - task: UseDotNet@2
@@ -85,7 +79,7 @@ jobs:
 
   - task: PowerShell@2
     displayName: Test Autorest-Based Cmdlets
-    condition: succeeded()
+    condition: succeededOrFailed()
     inputs:
       pwsh: true
       targetType: inline
@@ -103,18 +97,20 @@ jobs:
 
   - task: PowerShell@2
     displayName: Analyze Test Coverage
-    condition: succeeded()
+    condition: succeededOrFailed()
     inputs:
       pwsh: true
       targetType: filePath
       filePath: ./tools/TestFx/Coverage/AnalyzeTestCoverage.ps1
-      arguments: -CalcBaseline
+      arguments: '-CalcBaseline:$${{ parameters.updateBaseline }}'
 
   - template: util/get-github-pat-steps.yml
+    parameters:
+      execCondition: and(succeeded(), ${{ parameters.updateBaseline }})
 
   - task: PowerShell@2
     displayName: Update Test Coverage Baseline
-    condition: succeeded()
+    condition: and(succeeded(), ${{ parameters.updateBaseline }})
     inputs:
       pwsh: true
       targetType: inline

.azure-pipelines/util/get-github-pat-steps.yml

@@ -1,11 +1,17 @@
+parameters:
+- name: execCondition
+  type: string
+  default: succeeded()
+
 steps:
 - task: AzurePowerShell@5
+  displayName: Get GitHub PAT from Key Vault
+  condition: ${{ parameters.execCondition }}
   inputs:
     pwsh: true
+    azurePowerShellVersion: 'LatestVersion'
     azureSubscription: '$(AzureSubscription)'
     ScriptType: 'InlineScript'
     Inline: |
       $GithubToken = Get-AzKeyVaultSecret -VaultName $(GithubPATKeyVaultName) -Name $(GithubPATKeyVaultAccount) -AsPlainText
       Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$GithubToken"
-    azurePowerShellVersion: 'LatestVersion'
-  displayName: Get Github PAT from Key Vault

.github/CODEOWNERS

@@ -1,12 +1,12 @@
 # @wyunchi-ms @dolauli @isra-fel are from the Azure PowerShell team. Adding them ensures they can merge the PR for those modules.
 # To make sure Network PRs go to the right branch, e.g. network-april
-/src/Compute/    @EdwinBernal1 @grizzlytheodore @ntangy @sandido @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @msJinLei
-/src/PolicyInsights/  @pilor @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @msJinLei
-/src/Batch/ @wiboris @dpwatrous @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @msJinLei
+/src/Compute/    @EdwinBernal1 @grizzlytheodore @ntangy @sandido @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi
+/src/PolicyInsights/  @pilor @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi 
+/src/Batch/ @wiboris @dpwatrous @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi 
 
 # Make sure Device Registry team gets notified of any DeviceRegistry PRs:
 # PRLabel: %Device Registry
-/src/DeviceRegistry/ @marcodalessandro @rohankhandelwal @riteshrao @davidemontanari @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @msJinLei
+/src/DeviceRegistry/ @marcodalessandro @rohankhandelwal @riteshrao @davidemontanari @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi 
 
 # Make sure changes to .github folder go through our team's double check
-/.github/        @wyunchi-ms @dolauli @isra-fel
+/.github/        @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi

.github/policies/resourceManagement.yml

@@ -669,13 +669,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mksuni
-            - bgklein
-            - mscurrell
             - dpwatrous
-            - gingi
-            - paterasMSFT
+            - wiboris
             - cRui861
+            - skapur12
+            - wanghoppe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

docker/Dockerfile-ubuntu-20.04 docker/Dockerfile-ubuntu-24.04docker/Dockerfile-ubuntu-20.04 renamed to docker/Dockerfile-ubuntu-24.04

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:ubuntu-20.04
+FROM mcr.microsoft.com/powershell:ubuntu-24.04
 RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ARG REPOSITORY=PSGallery
@@ -11,9 +11,9 @@ ARG BUILD_DATE=
 ARG VERSION=
 ARG LATEST=
 ARG BLOB_URL=
-ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-20.04
+ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-24.04
 
-ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-20.04"
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-24.04"
 
 LABEL maintainer="Azure PowerShell Team <[email protected]>" \
       readme.md="http://aka.ms/azpsdockerreadme" \

eng/emitter-package.json

@@ -3,19 +3,19 @@
   "version": "0.1.0",
   "type": "module",
   "dependencies": {
-    "@typespec/compiler": "1.0.0",
+    "@typespec/compiler": "1.2.1",
     "@azure-tools/typespec-powershell": "0.0.x",
-    "@azure-tools/typespec-autorest": "0.56.0",
-    "@azure-tools/typespec-azure-core": "0.56.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.56.0",
-    "@azure-tools/typespec-client-generator-core": "0.56.0",
-    "@azure-tools/typespec-azure-rulesets": "0.56.0",
-    "@typespec/http": "1.0.1",
-    "@typespec/openapi": "1.0.0",
-    "@typespec/rest": "0.70.0",
-    "@typespec/streams": "0.70.0",
-    "@typespec/versioning": "0.70.0",
-    "@typespec/xml": "0.70.0",
+    "@azure-tools/typespec-autorest": "0.58.0",
+    "@azure-tools/typespec-azure-core": "0.58.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.58.0",
+    "@azure-tools/typespec-client-generator-core": "0.58.0",
+    "@azure-tools/typespec-azure-rulesets": "0.58.0",
+    "@typespec/http": "1.2.1",
+    "@typespec/openapi": "1.2.1",
+    "@typespec/rest": "0.72.1",
+    "@typespec/streams": "0.72.1",
+    "@typespec/versioning": "0.72.1",
+    "@typespec/xml": "0.72.1",
     "@azure-tools/typespec-liftr-base": "0.8.0"
   },
   "private": true

generated/ADDomainServices/ADDomainServices.Autorest/Az.ADDomainServices.csproj

@@ -3,6 +3,7 @@
     <PsModuleName>ADDomainServices</PsModuleName>
     <PsRootModuleName>ADDomainServices</PsRootModuleName>
     <PsModuleFolder>ADDomainServices.Autorest</PsModuleFolder>
+    <RootNamespace>Microsoft.Azure.PowerShell.Cmdlets.ADDomainServices</RootNamespace>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />

generated/Advisor/Advisor.Autorest/Az.Advisor.csproj

@@ -2,9 +2,10 @@
   <PropertyGroup>
     <PsModuleName>Advisor</PsModuleName>
     <PsRootModuleName>Advisor</PsRootModuleName>
+    <PsModuleFolder>Advisor.Autorest</PsModuleFolder>
+    <RootNamespace>Microsoft.Azure.PowerShell.Cmdlets.Advisor</RootNamespace>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
-
 </Project>