Merge release/10.7 into main#7556
Merged
Merged
Conversation
… objects (#7547) * Fix ToolJson.AdditionalProperties to accept sub-schema objects Change AdditionalProperties from bool to JsonElement so that JSON Schema additionalProperties values like {"type":"string"} are preserved instead of throwing a JsonException during deserialization. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Use JsonElement.Parse instead --------- Co-authored-by: David Cantu <dacantu@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Suppress NU1507 in Directory.Build.props (no package source mapping on internal branches) - Remove packageSourceMapping section from NuGet.config - Set StabilizePackageVersion=true and DotNetFinalVersionKind=release in eng/Versions.props - Add private feeds credentials setup tasks and comment out integration tests in BuildAndTest.yml - Remove codecoverage stage and its post-build dependency from azure-pipelines.yml Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Lift CVE-impacted transitive dependencies in test projects * eng/packages/Tests.props: pin OpenTelemetry.Api 1.15.3, NuGet.Packaging 6.8.2, and NuGet.Protocol 6.8.2 (keep OpenTelemetry.Exporter.InMemory at 1.9.0). * Add explicit OpenTelemetry.Api PackageReference to AI.Tests, AI.Integration.Tests, AI.OllamaSharp.Integration.Tests, and DataIngestion.Tests to lift the vulnerable transitive (GHSA-g94r-2vxg-569j). * Add explicit NuGet.Packaging and NuGet.Protocol PackageReferences to the AI/McpServer/Agents.AI template integration tests to lift the vulnerable transitive (GHSA-g4vj-cjjj-v7hg). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jozkee
approved these changes
Jun 9, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges release/10.7 into main, bringing along dependency version updates and adding explicit package references/central package versions to mitigate CVE-impacted transitive dependencies in test projects.
Changes:
- Bump a large set of runtime/AspNetCore/EFCore dependency versions (e.g., 9.0.15 → 9.0.17; net10 set 10.0.6 → 10.0.9) via
eng/Versions.propsandeng/Version.Details.xml. - Add explicit
PackageReferences in several test projects to “lift” vulnerable transitive dependencies (NuGet.* and OpenTelemetry.Api). - Centralize the pinned versions for those lifted packages in
eng/packages/Tests.props.
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| test/ProjectTemplates/Microsoft.McpServer.ProjectTemplates.IntegrationTests/Microsoft.McpServer.ProjectTemplates.Tests.csproj | Adds direct NuGet.* package references to override vulnerable transitives. |
| test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Microsoft.Extensions.AI.Templates.Tests.csproj | Adds direct NuGet.* package references to override vulnerable transitives. |
| test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Microsoft.Agents.AI.ProjectTemplates.Tests.csproj | Adds direct NuGet.* package references to override vulnerable transitives. |
| test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj | Adds direct OpenTelemetry.Api reference to override a vulnerable transitive dependency. |
| test/Libraries/Microsoft.Extensions.AI.Tests/Microsoft.Extensions.AI.Tests.csproj | Adds direct OpenTelemetry.Api reference to override a vulnerable transitive dependency. |
| test/Libraries/Microsoft.Extensions.AI.OllamaSharp.Integration.Tests/Microsoft.Extensions.AI.OllamaSharp.Integration.Tests.csproj | Adds direct OpenTelemetry.Api reference to override a vulnerable transitive dependency. |
| test/Libraries/Microsoft.Extensions.AI.Integration.Tests/Microsoft.Extensions.AI.Integration.Tests.csproj | Adds direct OpenTelemetry.Api reference to override a vulnerable transitive dependency. |
| eng/Versions.props | Updates dependency version properties; includes an out-of-sync version vs Version.Details.xml for Arcade templating tasks. |
| eng/Version.Details.xml | Updates tracked dependency versions/shas for runtime/aspnetcore/efcore. |
| eng/packages/Tests.props | Adds centrally-managed test package versions for NuGet.* and OpenTelemetry.Api. |
Collaborator
🎉 Good job! The coverage increased 🎉
Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1456597&view=codecoverage-tab |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge using a merge commit. Do not squash.
Microsoft Reviewers: Open in CodeFlow