chore: merge microsoft/main and resolve PublicAPI.Unshipped.txt conflict

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Mahdigln

.azure-pipelines/ci-build.yml

@@ -100,12 +100,16 @@ extends:
             arguments: '--configuration $(BuildConfiguration) --no-incremental'
 
         # Run the Unit test
-        - task: DotNetCoreCLI@2
+        - pwsh: |
+            dotnet test "$(Build.SourcesDirectory)\Microsoft.OpenApi.slnx" `
+              --configuration $(BuildConfiguration) `
+              --no-build `
+              -- `
+              --report-azdo `
+              --publish-azdo-test-results `
+              --results-directory="$(Agent.TempDirectory)\TestResults" `
+              --minimum-expected-tests 1
           displayName: 'test'
-          inputs:
-            command: test
-            projects: '$(Build.SourcesDirectory)\Microsoft.OpenApi.slnx'
-            arguments: '--configuration $(BuildConfiguration) --no-build'
 
         - task: EsrpCodeSigning@6
           displayName: 'ESRP CodeSigning binaries'
@@ -287,7 +291,7 @@ extends:
                 vmImage: ubuntu-latest
               steps:
               - pwsh: |
-                  $fileNames = "$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.YamlReader.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.Workbench.*.nupkg"
+                  $fileNames = "$(Pipeline.Workspace)/Microsoft.OpenApi.Hidi.*.nupkg", "$(Pipeline.Workspace)/Microsoft.OpenApi.YamlReader.*.nupkg"
                   foreach($fileName in $fileNames) {
                     if(Test-Path $fileName) {
                       Remove-Item $fileName -Verbose

.github/dependabot.yml

@@ -5,6 +5,10 @@ updates:
   open-pull-requests-limit: 10
   schedule:
     interval: daily
+  groups:
+    codeql:
+      patterns:
+      - github/codeql-action*
   cooldown:
     default-days: 7
 - package-ecosystem: nuget
@@ -16,9 +20,12 @@ updates:
     MicrosoftExtensions:
       patterns:
       - Microsoft.Extensions.*
-    coverlet:
+    testing:
       patterns:
       - coverlet.*
+      - Microsoft.NET.Test.Sdk
+      - Microsoft.Testing.*
+      - xunit.*
   cooldown:
     default-days: 7
 - package-ecosystem: dotnet-sdk

.github/workflows/ci-cd.yml

@@ -45,7 +45,7 @@ jobs:
         id: run_unit_tests
         shell: pwsh
         run: |
-          dotnet test Microsoft.OpenApi.slnx -c Release --no-build -v n --collect:"XPlat Code Coverage"
+          dotnet test --solution Microsoft.OpenApi.slnx -c Release -v n --results-directory=./TestResults --coverlet --coverlet-output-format cobertura --report-gh
 
       - name: Install report generator
         shell: pwsh
@@ -55,7 +55,7 @@ jobs:
       - name: Generate coverage report
         shell: pwsh
         run: |
-          reportgenerator -reports:**/coverage.cobertura.xml -targetdir:./reports/coverage -reporttypes:"Html;MarkdownSummaryGithub;Cobertura"
+          reportgenerator -reports:./TestResults/**/coverage.cobertura.*.xml -targetdir:./reports/coverage -reporttypes:"Html;MarkdownSummaryGithub;Cobertura"
 
       - name: Add coverage to job summary
         shell: bash

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Initialize CodeQL
         id: init_codeql
-        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+        uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
         with:
           queries: security-and-quality
 
@@ -54,6 +54,6 @@ jobs:
 
       - name: Perform CodeQL Analysis
         id: analyze_codeql
-        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+        uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
 
 # Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

.github/workflows/promote-shipped-apis.yml

@@ -7,6 +7,10 @@ on:
       - support/v2
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   promote-apis:
     runs-on: ubuntu-latest
@@ -20,6 +24,15 @@ jobs:
         with:
           client-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }}
           private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
+          permission-contents: write
+          permission-pull-requests: write
+
+      - name: Get GitHub App user ID
+        id: get-user-id
+        shell: bash
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
 
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -32,9 +45,9 @@ jobs:
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global url."https://$($env:GH_TOKEN)@github.com/".insteadOf "https://github.com/"
+          git config --global user.name "${{ steps.app-token.outputs.app-slug }}[bot]"
+          git config --global user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com"
+          git config --global url."https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/".insteadOf "https://github.com/"
       
       - name: Check for existing PR
         id: check_pr

.github/workflows/sonarcloud.yml

@@ -35,9 +35,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+        uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 17
       - name: Setup .NET 8
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
@@ -61,12 +61,10 @@ jobs:
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          CollectCoverage: true
-          CoverletOutputFormat: 'opencover' # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682
         shell: pwsh
         run: |
-          dotnet tool run dotnet-sonarscanner begin /k:"microsoft_OpenAPI.NET" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="test/**/coverage.opencover.xml"
+          dotnet tool run dotnet-sonarscanner begin /k:"microsoft_OpenAPI.NET" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover*.xml"
           dotnet workload restore
           dotnet build
-          dotnet test Microsoft.OpenApi.slnx --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-          dotnet tool run dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+          dotnet test --solution Microsoft.OpenApi.slnx --verbosity normal --coverlet --coverlet-output-format opencover --report-gh
+          dotnet tool run dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

.gitignore

@@ -127,7 +127,7 @@ nCrunchTemp_*
 *.mm.*
 AutoTest.Net/
 
-# Web workbench (sass)
+# Sass cache
 .sass-cache/
 
 # Installshield output folder

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "3.10.0"
+  ".": "3.10.2"
 }

.vscode/launch.json

@@ -49,23 +49,7 @@
             "console": "internalConsole",
             "stopAtEntry": false,
             "requireExactSource": false,
-        },
-        {
-            // Use IntelliSense to find out which attributes exist for C# debugging
-            // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
-            "name": "Launch Workbench",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Microsoft.OpenApi.WorkBench/bin/Debug/net8.0-windows/Microsoft.OpenApi.Workbench.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}/src/Microsoft.OpenApi.Workbench",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
-        },        
+        },       
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

.vscode/tasks.json

@@ -43,12 +43,6 @@
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "workbench",
-            "type": "shell",
-            "command": "src/Microsoft.OpenApi.WorkBench/bin/Debug/Microsoft.OpenApi.WorkBench.exe",
-            "problemMatcher": []
         }
     ]
 }