Fix sync alias issue and replace .NET SDK version from 8.0.x with 8.x (#27335)

vidai-msft · web-flow · commit cb665a53cc70 · 2025-03-15T22:26:17.000+08:00
diff --git a/.azure-pipelines/azure-powershell-ci.yml b/.azure-pipelines/azure-powershell-ci.yml
@@ -95,7 +95,7 @@ jobs:
     displayName: 'Use .NET SDK for Build'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: NodeTool@0
     displayName: Install Autorest
     inputs:
@@ -228,7 +228,7 @@ jobs:
     displayName: 'Use .NET SDK for Static Analysis'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Analyze'
     inputs:
@@ -270,7 +270,7 @@ jobs:
     displayName: 'Use .NET SDK for Test'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Test'
     inputs:
diff --git a/.azure-pipelines/daily-build.yml b/.azure-pipelines/daily-build.yml
@@ -31,7 +31,7 @@ jobs:
     displayName: 'Use .NET SDK'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: Prepare Powershell $(PSVersion)
     inputs:
diff --git a/.azure-pipelines/powershell-core.yml b/.azure-pipelines/powershell-core.yml
@@ -43,7 +43,7 @@ jobs:
     displayName: 'Use .NET SDK for Build'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: NodeTool@0
     displayName: Install Autorest
     inputs:
@@ -121,7 +121,7 @@ jobs:
     displayName: 'Use .NET SDK for Static Analysis'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Analyze'
     inputs:
@@ -163,7 +163,7 @@ jobs:
     displayName: 'Use .NET SDK for Test'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Test'
     inputs:
diff --git a/.azure-pipelines/security-tools.yml b/.azure-pipelines/security-tools.yml
@@ -23,7 +23,7 @@ jobs:
     displayName: 'Use .NET SDK 8.0 for Build'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: NodeTool@0
     displayName: Install Autorest
     inputs:
@@ -84,7 +84,7 @@ jobs:
     displayName: 'Use .NET SDK 6.0 for CredScan'
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 6.x
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
     displayName: Run CredScan
     inputs:
diff --git a/.azure-pipelines/sync-aliases.yml b/.azure-pipelines/sync-aliases.yml
@@ -26,7 +26,7 @@ jobs:
     displayName: Install .NET SDK
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
 
   - pwsh: |
       dotnet --version
diff --git a/.azure-pipelines/test-coverage.yml b/.azure-pipelines/test-coverage.yml
@@ -2,7 +2,7 @@ parameters:
 - name: dotnet_sdk
   displayName: .NET SDK
   type: string
-  default: 8.0.x
+  default: 8.x
 - name: testFramework
   displayName: Test Framework
   type: string
diff --git a/.azure-pipelines/util/analyze-steps.yml b/.azure-pipelines/util/analyze-steps.yml
@@ -30,7 +30,7 @@ steps:
   displayName: 'Use .NET SDK'
   inputs:
     packageType: sdk
-    version: 8.0.x
+    version: 8.x
 
 - pwsh: 'Install-Module "platyPS", "PSScriptAnalyzer" -Force -Confirm:$false -Scope CurrentUser'
   displayName: 'Install PowerShell Dependencies'
diff --git a/.azure-pipelines/util/build-steps.yml b/.azure-pipelines/util/build-steps.yml
@@ -12,7 +12,7 @@ steps:
   displayName: 'Use .NET SDK'
   inputs:
     packageType: sdk
-    version: 8.0.x
+    version: 8.x
 - task: DotNetCoreCLI@2
   displayName: Filter changed files
   inputs:
diff --git a/.azure-pipelines/util/test-steps.yml b/.azure-pipelines/util/test-steps.yml
@@ -14,7 +14,7 @@ steps:
   displayName: 'Use .NET SDK'
   inputs:
     packageType: sdk
-    version: 8.0.x
+    version: 8.x
 
 - task: PowerShell@2
   displayName: Remove pre-installed Az modules
diff --git a/.azure-pipelines/windows-powershell.yml b/.azure-pipelines/windows-powershell.yml
@@ -39,7 +39,7 @@ jobs:
     displayName: 'Use .NET SDK for Build'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: NodeTool@0
     displayName: Install Autorest
     inputs:
@@ -117,7 +117,7 @@ jobs:
     displayName: 'Use .NET SDK for Static Analysis'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Analyze'
     inputs:
@@ -142,7 +142,7 @@ jobs:
     displayName: 'Use .NET SDK for Test'
     inputs:
       packageType: sdk
-      version: 8.0.x
+      version: 8.x
   - task: PowerShell@2
     displayName: 'Test'
     inputs:
diff --git a/tools/Github/ParseServiceContactsList.ps1 b/tools/Github/ParseServiceContactsList.ps1
@@ -26,28 +26,18 @@ function InitializeRequiredPackages {
     [CmdletBinding()]
     param ()
 
-    $packagesDirectoryName = "JsonYamlPackages"
-    $packagesDirectory = Join-Path -Path . -ChildPath $packagesDirectoryName
-    if (Test-Path -LiteralPath $packagesDirectory) {
-        Remove-Item -LiteralPath $packagesDirectory -Recurse -Force
+    if (-not (Get-PackageProvider -Name NuGet -ErrorAction SilentlyContinue)) {
+        Install-PackageProvider -Name NuGet -Force
     }
 
-    New-Item -Path . -Name $packagesDirectoryName -ItemType Directory -Force
-
-    $requiredPackages = @(
-        @{ PackageName = "Newtonsoft.Json"; PackageVersion = "13.0.2"; DllName = "Newtonsoft.Json.dll" },
-        @{ PackageName = "YamlDotNet"; PackageVersion = "13.2.0"; DllName = "YamlDotNet.dll" }
-    )
-
-    $requiredPackages | ForEach-Object {
-        $packageName = $_["PackageName"]
-        $packageVersion = $_["PackageVersion"]
-        $packageDll = $_["DllName"]
-        Install-Package -Name $packageName -RequiredVersion $packageVersion -Source "https://www.nuget.org/api/v2" -Destination $packagesDirectory -SkipDependencies -ExcludeVersion -Force
-        Add-Type -LiteralPath (Join-Path -Path $packagesDirectory -ChildPath $packageName | Join-Path -ChildPath "lib" | Join-Path -ChildPath "net8.0" | Join-Path -ChildPath $packageDll) -ErrorAction SilentlyContinue
-    }
+    Install-Package -Name YamlDotNet -RequiredVersion ${env:YamlDotNetVersion} -ProviderName NuGet -Force
+    $pkgYaml = Get-Package -Name YamlDotNet | Select-Object -ExpandProperty Source | Split-Path
+    $dllYaml = Join-Path -Path $pkgYaml -ChildPath "lib" | Join-Path -ChildPath "netstandard2.0" | Join-Path -ChildPath "YamlDotNet.dll"
+    Add-Type -LiteralPath $dllYaml
 }
 
+$ErrorActionPreference = "Stop"
+
 # get wiki content
 $username = ""
 $password = $AccessToken
@@ -58,89 +48,95 @@ $headers = @{
     Authorization = "Basic {0}" -f ($token)
 }
 
-$response = Invoke-RestMethod 'https://dev.azure.com/azclitools/internal/_apis/wiki/wikis/internal.wiki/pages?path=/Service%20Contact%20List&includeContent=true' -Headers $headers -ErrorAction Stop
-$contactsList = ($response.content -split "\n") | Where-Object { $_ -like '|*' } | Select-Object -Skip 2
-
-if ($null -ne $contactsList) {
-    $idxServiceTeamLabel = 2
-    $idxPSNotifyGithubHandler = 6
-    $serviceContacts = [System.Collections.Generic.SortedList[System.String, PSCustomObject]]::new()
-
-    foreach ($contacts in $contactsList) {
-        $items = $contacts -split "\|"
-        $colServiceTeamLabel = $items[$idxServiceTeamLabel]
-        if (![string]::IsNullOrWhiteSpace($colServiceTeamLabel)) {
-            $serviceTeamLabel = $colServiceTeamLabel.Trim()
-            $colPSNotifyGithubHandler = $items[$idxPSNotifyGithubHandler]
-
-            if (![string]::IsNullOrWhiteSpace($colPSNotifyGithubHandler)) {
-                $psNotifyGithubHandler = $colPSNotifyGithubHandler.Trim()
-                [array]$mentionees = $psNotifyGithubHandler.Split(",", [StringSplitOptions]::RemoveEmptyEntries) | ForEach-Object {
-                    $_.Trim()
-                }
-
-                $serviceContacts.Add($serviceTeamLabel, [PSCustomObject]@{
-                        if   = @(
-                            [PSCustomObject]@{
-                                or = @(
-                                    [PSCustomObject]@{
-                                        labelAdded = [PSCustomObject]@{
-                                            label = 'Service Attention'
-                                        }
-                                    },
-                                    [PSCustomObject]@{
-                                        labelAdded = [PSCustomObject]@{
-                                            label = $serviceTeamLabel
+try {
+    $response = Invoke-RestMethod ${env:ServiceContactsListUrl} -Headers $headers -ErrorAction Stop
+    $contactsList = ($response.content -split "\n") | Where-Object { $_ -like '|*' } | Select-Object -Skip 2
+
+    if ($null -ne $contactsList) {
+        $idxServiceTeamLabel = 2
+        $idxPSNotifyGithubHandler = 6
+        $serviceContacts = [System.Collections.Generic.SortedList[System.String, PSCustomObject]]::new()
+
+        foreach ($contacts in $contactsList) {
+            $items = $contacts -split "\|"
+            $colServiceTeamLabel = $items[$idxServiceTeamLabel]
+            if (![string]::IsNullOrWhiteSpace($colServiceTeamLabel)) {
+                $serviceTeamLabel = $colServiceTeamLabel.Trim()
+                $colPSNotifyGithubHandler = $items[$idxPSNotifyGithubHandler]
+
+                if (![string]::IsNullOrWhiteSpace($colPSNotifyGithubHandler)) {
+                    $psNotifyGithubHandler = $colPSNotifyGithubHandler.Trim()
+                    [array]$mentionees = $psNotifyGithubHandler.Split(",", [StringSplitOptions]::RemoveEmptyEntries) | ForEach-Object {
+                        $_.Trim()
+                    }
+
+                    $serviceContacts.Add($serviceTeamLabel, [PSCustomObject]@{
+                            if   = @(
+                                [PSCustomObject]@{
+                                    or = @(
+                                        [PSCustomObject]@{
+                                            labelAdded = [PSCustomObject]@{
+                                                label = 'Service Attention'
+                                            }
+                                        },
+                                        [PSCustomObject]@{
+                                            labelAdded = [PSCustomObject]@{
+                                                label = $serviceTeamLabel
+                                            }
                                         }
+                                    )
+                                },
+                                [PSCustomObject]@{
+                                    hasLabel = [PSCustomObject]@{
+                                        label = 'Service Attention'
+                                    }
+                                },
+                                [PSCustomObject]@{
+                                    hasLabel = [PSCustomObject]@{
+                                        label = $serviceTeamLabel
                                     }
-                                )
-                            },
-                            [PSCustomObject]@{
-                                hasLabel = [PSCustomObject]@{
-                                    label = 'Service Attention'
-                                }
-                            },
-                            [PSCustomObject]@{
-                                hasLabel = [PSCustomObject]@{
-                                    label = $serviceTeamLabel
                                 }
-                            }
-                        )
-                        then = @(
-                            [PSCustomObject]@{
-                                mentionUsers = [PSCustomObject]@{
-                                    mentionees       = $mentionees
-                                    replyTemplate    = 'Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.'
-                                    assignMentionees = 'False'
+                            )
+                            then = @(
+                                [PSCustomObject]@{
+                                    mentionUsers = [PSCustomObject]@{
+                                        mentionees       = $mentionees
+                                        replyTemplate    = 'Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.'
+                                        assignMentionees = 'False'
+                                    }
                                 }
-                            }
-                        )
-                    })
+                            )
+                        })
+                }
             }
         }
     }
-}
 
-# Update yaml file
-InitializeRequiredPackages
+    # Update yaml file
+    InitializeRequiredPackages
 
-$yamlConfigPath = $PSScriptRoot | Split-Path | Split-Path | Join-Path -ChildPath ".github" | Join-Path -ChildPath "policies" | Join-Path -ChildPath "resourceManagement.yml"
-$yamlContent = Get-Content -Path $yamlConfigPath -Raw
-$yamlDeserializer = [YamlDotNet.Serialization.DeserializerBuilder]::new().Build()
-$yamlObjectGraph = $yamlDeserializer.Deserialize($yamlContent)
-$jsonSerializer = [YamlDotNet.Serialization.SerializerBuilder]::new().JsonCompatible().Build()
-$jsonObjectGraph = $jsonSerializer.Serialize($yamlObjectGraph) | ConvertFrom-Json
+    $yamlConfigPath = $PSScriptRoot | Split-Path | Split-Path | Join-Path -ChildPath ".github" | Join-Path -ChildPath "policies" | Join-Path -ChildPath "resourceManagement.yml"
+    $yamlContent = Get-Content -Path $yamlConfigPath -Raw
+    $yamlDeserializer = [YamlDotNet.Serialization.DeserializerBuilder]::new().Build()
+    $yamlObjectGraph = $yamlDeserializer.Deserialize($yamlContent)
+    $jsonSerializer = [YamlDotNet.Serialization.SerializerBuilder]::new().JsonCompatible().Build()
+    $jsonObjectGraph = $jsonSerializer.Serialize($yamlObjectGraph) | ConvertFrom-Json
 
-$serviceContactsTask = $jsonObjectGraph.configuration.resourceManagementConfiguration.eventResponderTasks | Where-Object { $_.description -eq "Triage issues to the service team" }
-if ($null -ne $serviceContactsTask) {
-    $serviceContactsTask.then = $serviceContacts.Values
-}
+    $serviceContactsTask = $jsonObjectGraph.configuration.resourceManagementConfiguration.eventResponderTasks | Where-Object { $_.description -eq "Triage issues to the service team" }
+    if ($null -ne $serviceContactsTask) {
+        $serviceContactsTask.then = $serviceContacts.Values
+    }
 
-$updatedJsonContent = $jsonObjectGraph | ConvertTo-Json -Depth 64
-$updatedJsonObjectGraph = [Newtonsoft.Json.JsonConvert]::DeserializeObject[System.Dynamic.ExpandoObject]($updatedJsonContent)
-$yamlSerializer = [YamlDotNet.Serialization.SerializerBuilder]::new().Build()
-$updatedYamlContent = $yamlSerializer.Serialize($updatedJsonObjectGraph)
-$updatedYamlContent | Out-File -FilePath $yamlConfigPath -NoNewline -Force
+    $updatedJsonContent = $jsonObjectGraph | ConvertTo-Json -Depth 64
+    $updatedJsonObjectGraph = [Newtonsoft.Json.JsonConvert]::DeserializeObject[System.Dynamic.ExpandoObject]($updatedJsonContent)
+    $yamlSerializer = [YamlDotNet.Serialization.SerializerBuilder]::new().Build()
+    $updatedYamlContent = $yamlSerializer.Serialize($updatedJsonObjectGraph)
+    $updatedYamlContent | Out-File -FilePath $yamlConfigPath -NoNewline -Force
 
-# Remove trailing space on each line
-(Get-Content -Path $yamlConfigPath) | ForEach-Object { $_.TrimEnd() } | Set-Content -Path $yamlConfigPath
+    # Remove trailing space on each line
+    (Get-Content -Path $yamlConfigPath) | ForEach-Object { $_.TrimEnd() } | Set-Content -Path $yamlConfigPath
+}
+catch {
+    Write-Error "Error occurred while updating the resourceManagement.yml file. Error Message: $($_.Exception.Message)"
+    throw
+}
