Skip to content

Merge release/10.5 into main#7470

Merged
jeffhandley merged 10 commits into
mainfrom
merge/10.5-to-main
Apr 15, 2026
Merged

Merge release/10.5 into main#7470
jeffhandley merged 10 commits into
mainfrom
merge/10.5-to-main

Conversation

@jeffhandley
Copy link
Copy Markdown
Member

@jeffhandley jeffhandley commented Apr 15, 2026

Merge using a merge commit. Do not squash.

Microsoft Reviewers: Open in CodeFlow

dependabot Bot and others added 10 commits April 10, 2026 21:46
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.4.1 to 6.4.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.4.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.4.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.4.2
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update brace-expansion for CVE-2026-33750

* Update the package-lock file.

---------

Co-authored-by: Peter Waldschmidt <pewaldsc@microsoft.com>
* Use shared DiagnosticIds constants for MEVD experimental APIs

Replace hard-coded [Experimental("MEVD9001")] attributes in
Microsoft.Extensions.VectorData.Abstractions with constants from
the shared DiagnosticIds class, matching the pattern used by MEAI.

- Add VectorDataCollectionModel, VectorDataPropertyModel,
  VectorDataFilterTranslation, and VectorDataEmbeddingGeneration
  experiment constants to src/Shared/DiagnosticIds/DiagnosticIds.cs
- Add InjectSharedDiagnosticIds to the MEVD.Abstractions csproj
- Update all 17 [Experimental] usages to reference constants with
  UrlFormat
- Add MEVD9001 suppression to Directory.Build.targets
- Add MEVD9001 to docs/list-of-diagnostics.md

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix SA1210: order using directives alphabetically

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Collapse MEVD experimental categories into single VectorDataProviderServices

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Update ApiChief baselines for MEAI and MEVD

Ran '/run-apichief' skill for MEAI and MEVD.

Noteworthy changes for reviewers:

- MEVD.Abstractions PublicKeyToken changed from 31bf3856ad364e35
  (Microsoft strong name key) to f300afd708cefcd3. This differs from
  MEVD.ConformanceTests and all MEAI assemblies, which still use the
  original key. This reflects the assembly as-built and is not a
  baseline editing artifact.

- MEVD.Abstractions: CollectionModelBuildingOptions.CollectionModelBuildingOptions()
  stage changed from Experimental to Obsolete. The C# compiler emits
  [Obsolete] on parameterless constructors of types with 'required'
  members to protect older compilers. ApiChief's ParsedMember handles
  the analogous compiler-generated [Obsolete] for readonly ref structs
  but doesn't yet have a carve-out for the required-members variant,
  so it reports Obsolete instead of inheriting the parent type's
  Experimental stage.

- MEVD.Abstractions: 'where TRecord : class' generic constraints now
  appear on IKeywordHybridSearchable<TRecord>,
  IVectorSearchable<TRecord>, and VectorSearchResult<TRecord>.

- MEVD.Abstractions: Primary constructor portion removed from
  PropertyModel Type field (ILSpy decompiler limitation, issue
  icsharpcode/ILSpy#829 still open). Instruction comments added.

- MEVD.ConformanceTests: New baseline file (2597 lines). Primary
  constructor portions removed from 14 abstract test class Type fields
  with instruction comments.

- MEAI.Abstractions: ~70 new types added including Realtime client
  abstractions (IRealtimeClient, IRealtimeClientSession,
  RealtimeClientMessage, RealtimeServerMessage and subtypes),
  ITextToSpeechClient, ISpeechToTextClient, IHostedFileClient,
  HostedFileSearchTool, HostedImageGenerationTool, HostedMcpServerTool,
  and related content types. ~27 types removed/replaced.

- MEAI: ~25 new types for Realtime, TextToSpeech, and HostedFile
  delegating clients, builders, logging, and OpenTelemetry wrappers.

- MEAI.OpenAI: New OpenAIRealtimeClient, OpenAIRealtimeClientSession,
  and extension methods for AsIHostedFileClient/AsITextToSpeechClient.

- MEAI: 'scoped' replaced with 'params' on 4 ReadOnlySpan<object?>
  parameters (ILSpy decompiler limitation, icsharpcode/ILSpy#829).
  Instruction comments restored.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Exclude MEVD.ConformanceTests from ApiChief

* Override CollectionModelBuildingOptions stage to Experimental

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jeffhandley jeffhandley requested a review from joperezr April 15, 2026 21:51
@jeffhandley jeffhandley self-assigned this Apr 15, 2026
@jeffhandley jeffhandley requested a review from a team as a code owner April 15, 2026 21:51
Copilot AI review requested due to automatic review settings April 15, 2026 21:51
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Merges release/10.5 into main by bringing forward the latest dependency version updates tracked by Arcade/Maestro, keeping eng/Versions.props and eng/Version.Details.xml aligned.

Changes:

  • Updated .NET 9.x dependency versions from 9.0.14 to 9.0.15 across runtime/aspnetcore/efcore packages.
  • Updated .NET 10.x dependency versions from 10.0.5 to 10.0.6 in Versions.props.
  • Updated LTS (8.0.x) dependency versions from 8.0.25 to 8.0.26 (and System.Security.Cryptography.Xml to 8.0.3) in Versions.props, plus refreshed source SHAs in Version.Details.xml.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
eng/Versions.props Bumps pinned package versions for net9/net10 and LTS sets to the next servicing versions.
eng/Version.Details.xml Updates dependency versions and corresponding commit SHAs for runtime/aspnetcore/efcore tracked dependencies.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants