Merge remote-tracking branch 'refs/remotes/origin/main' into gavinbarron-xunit-mtp-main-squash-port

# Conflicts:
#	.github/workflows/sonarcloud.yml
#	test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj

Co-authored-by: baywet <[email protected]>

Author: Copilot

.azure-pipelines/ci-build.yml

@@ -67,16 +67,6 @@ extends:
               Write-Host "##vso[task.setvariable variable=ODataVersion]$version"
             displayName: 'Validate OData component tag and project version'
 
-          - task: UseDotNet@2
-            displayName: 'Use .NET 6' # needed for ESRP signing
-            inputs:
-              version: 6.x
-
-          - task: UseDotNet@2
-            displayName: 'Use .NET 8'
-            inputs:
-              version: 8.x
-
           - task: UseDotNet@2
             displayName: 'Use .NET 10'
             inputs:

.azure-pipelines/hidi-release.yml

@@ -59,14 +59,6 @@ extends:
                   }
                   Write-Host "##vso[task.setvariable variable=HidiVersion]$version"
                 displayName: Validate Hidi component tag and project version
-              - task: UseDotNet@2
-                displayName: Use .NET 6 for ESRP
-                inputs:
-                  version: 6.x
-              - task: UseDotNet@2
-                displayName: Use .NET 8
-                inputs:
-                  version: 8.x
               - task: UseDotNet@2
                 displayName: Use .NET 10
                 inputs:
@@ -155,7 +147,7 @@ extends:
                   & .\artifacts\hidi\win-x64\Microsoft.OpenApi.Hidi.exe --help
                   if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
                   New-Item -ItemType Directory -Force artifacts\hidi\signing | Out-Null
-                  Copy-Item src\Microsoft.OpenApi.Hidi\bin\$(buildConfiguration)\net8.0\Microsoft.OpenApi.Hidi.dll artifacts\hidi\signing
+                  Copy-Item src\Microsoft.OpenApi.Hidi\bin\$(buildConfiguration)\net10.0\Microsoft.OpenApi.Hidi.dll artifacts\hidi\signing
                   Copy-Item artifacts\hidi\win-x64\Microsoft.OpenApi.Hidi.exe artifacts\hidi\signing
                 displayName: Stage hidi binaries
               - task: EsrpCodeSigning@6

.github/workflows/ci-cd.yml

@@ -19,9 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@0f4a354dd5547a28c70b7853dbd95d5b67886e73 # v6.1.0
         with:
-          dotnet-version: |
-            8.0.x
-            10.0.x
+          dotnet-version: 10.0.x
 
       - name: Data gatherer
         id: data_gatherer
@@ -168,9 +166,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: actions/setup-dotnet@0f4a354dd5547a28c70b7853dbd95d5b67886e73 # v6.1.0
         with:
-          dotnet-version: |
-            8.0.x
-            10.0.x
+          dotnet-version: 10.0.x
       - name: Publish and smoke-test Windows executable
         shell: pwsh
         run: |

.github/workflows/codeql-analysis.yml

@@ -44,9 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@0f4a354dd5547a28c70b7853dbd95d5b67886e73 # v6.1.0
       with:
-        dotnet-version: |
-          8.0.x
-          10.0.x
+        dotnet-version: 10.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/sonarcloud.yml

@@ -43,9 +43,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@0f4a354dd5547a28c70b7853dbd95d5b67886e73 # v6.1.0
         with:
-          dotnet-version: |
-            8.0.x
-            10.0.x
+          dotnet-version: 10.0.x
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
@@ -124,7 +122,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         shell: pwsh
         run: |
-          dotnet tool run dotnet-sonarscanner begin /k:"microsoft_OpenAPI.NET.OData" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="artifacts/test-results/*opencover*.xml" /d:sonar.coverageReportPaths="artifacts/hidi/powershell-coverage/sonar-coverage.xml"
+          dotnet tool run dotnet-sonarscanner begin /k:"microsoft_OpenAPI.NET.OData" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="artifacts/test-results/*opencover*.xml,test/**/coverage.opencover.xml,artifacts/hidi/coverage/*opencover*.xml" /d:sonar.coverageReportPaths="artifacts/hidi/powershell-coverage/sonar-coverage.xml"
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
           dotnet workload restore
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /app/hidi
 RUN --mount=type=secret,id=nuget_config,target=/app/hidi/NuGet.Config \
     dotnet publish ./src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -c Release -o /app/publish -p:GeneratePackageOnBuild=false -p:HidiPublicSignBuild=true
 
-FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled AS runtime
+FROM mcr.microsoft.com/dotnet/runtime:10.0-noble-chiseled AS runtime
 WORKDIR /app
 
 COPY --from=build-env /app/publish ./

README.md

@@ -86,13 +86,16 @@ The `GetEdmModel()` method can load a model in 3 ways:
 
 The OpenAPI.OData.reader nuget package is at: [https://www.nuget.org/packages/Microsoft.OpenApi.OData/](https://www.nuget.org/packages/Microsoft.OpenApi.OData)
 
+The package targets .NET 10 and depends on Microsoft.OData.Edm 9.x.
+
 ## Hidi command line tool
 
 [Hidi](src/Microsoft.OpenApi.Hidi/readme.md) validates, transforms and slices
 OpenAPI documents, converts OData CSDL, and generates API diagrams.
 The NuGet package remains `Microsoft.OpenApi.Hidi` and the command remains `hidi`.
 Hidi 3.x is maintained on `main`; Hidi 2.x is maintained on `support/v2`.
-Both tracks use independent versions and require the .NET 8 runtime.
+Both tracks use independent versions. Hidi 3.x requires the .NET 10 runtime;
+Hidi 2.x requires the .NET 8 runtime.
 Building this repository, including the Hidi tests, requires the .NET 10 SDK.
 The main Hidi pipeline sets `hidiPublishingEnabled: 'true'` for stable
 `hidi-v3.*` tag releases; `hidiPreviewPublishingEnabled: 'false'` keeps main

install-tool.ps1

@@ -19,7 +19,7 @@ if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
 $installedDlls = @(Get-ChildItem $toolDirectory -Force -Recurse -Filter Microsoft.OpenApi.Hidi.dll)
 if ($installedDlls.Count -ne 1) { throw 'Expected exactly one installed hidi DLL.' }
-$builtDll = Join-Path $PSScriptRoot 'src\Microsoft.OpenApi.Hidi\bin\Release\net8.0\Microsoft.OpenApi.Hidi.dll'
+$builtDll = Join-Path $PSScriptRoot 'src\Microsoft.OpenApi.Hidi\bin\Release\net10.0\Microsoft.OpenApi.Hidi.dll'
 if ((Get-FileHash $installedDlls[0].FullName).Hash -ne (Get-FileHash $builtDll).Hash) {
   throw 'Installed hidi does not match the locally built package.'
 }

scripts/verify-hidi-package-assembly.ps1

@@ -31,8 +31,8 @@ $archive = $null
 try {
     $archive = [IO.Compression.ZipFile]::OpenRead((Resolve-Path -LiteralPath $PackagePath).Path)
     $assemblies = @($archive.Entries | Where-Object { $_.Name -ieq 'Microsoft.OpenApi.Hidi.dll' })
-    if ($assemblies.Count -ne 1 -or $assemblies[0].FullName -cne 'tools/net8.0/any/Microsoft.OpenApi.Hidi.dll') {
-        throw 'Expected exactly one Hidi DLL at tools/net8.0/any/Microsoft.OpenApi.Hidi.dll.'
+    if ($assemblies.Count -ne 1 -or $assemblies[0].FullName -cne 'tools/net10.0/any/Microsoft.OpenApi.Hidi.dll') {
+        throw 'Expected exactly one Hidi DLL at tools/net10.0/any/Microsoft.OpenApi.Hidi.dll.'
     }
     [IO.Compression.ZipFileExtensions]::ExtractToFile($assemblies[0], $packagedAssembly)
 

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -67,7 +67,7 @@ public override void Visit(OpenApiOperation operation)
 
             var operationId = operation.OperationId;
             var operationTypeExtension = operation.Extensions?.GetExtension("x-ms-docs-operation-type");
-            if (operationTypeExtension.IsEquals("function") && operation.Parameters is { Count :> 0})
+            if (operationTypeExtension.IsEquals("function") && operation.Parameters is { Count: > 0 })
                 ResolveFunctionParameters(operation.Parameters);
 
             // Order matters. Resolve operationId.
@@ -106,7 +106,7 @@ private static string ResolveByRefOperationId(string operationId)
             // Update $ref path operationId name
             // Ref key word is enclosed between lower-cased and upper-cased letters
             // Ex.: applications_GetRefCreatedOnBehalfOf to applications_GetCreatedOnBehalfOfByRef
-            return s_oDataRefRegex.Match(operationId).Success ? $"{s_oDataRefRegex.Replace(operationId, string.Empty)}ByRef" : operationId;
+            return s_oDataRefRegex.IsMatch(operationId) ? $"{s_oDataRefRegex.Replace(operationId, string.Empty)}ByRef" : operationId;
         }
 
         private static string ResolveODataCastOperationId(string operationId)
@@ -175,8 +175,8 @@ private static void ResolveFunctionParameters(IList<IOpenApiParameter> parameter
 
         private void AddAdditionalPropertiesToSchema(IOpenApiSchema schema)
         {
-            if (schema is OpenApiSchema openApiSchema 
-                && !_schemaLoop.Contains(schema) 
+            if (schema is OpenApiSchema openApiSchema
+                && !_schemaLoop.Contains(schema)
                 && schema.Type.Equals(JsonSchemaType.Object))
             {
                 openApiSchema.AdditionalProperties = new OpenApiSchema() { Type = JsonSchemaType.Object };