Merge main into data-ingestion-preview2#7583
Merged
adamsitnik merged 174 commits intoJun 24, 2026
Merged
Conversation
… MaxTopCount (#7311) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com>
…th ReferenceEquals (#7302) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> Co-authored-by: Stephen Toub <stoub@microsoft.com>
* Remove main-to-dev inter-branch merge automation The dev branch has been deprecated and merged into main. The inter-branch merge workflow and its configuration were still active, causing unnecessary PRs to be created that had to be manually closed. This removes: - .github/workflows/inter-branch-merge-flow.yml (the GitHub Action) - github-merge-flow.jsonc (the merge flow configuration) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove dev branch from Azure Pipelines trigger/PR configs The dev branch is deprecated. Remove it from the trigger and PR branch includes in both azure-pipelines-public.yml and azure-pipelines.yml. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…mentations (#7316) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
#7307) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> Co-authored-by: Stephen Toub <stoub@microsoft.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> Co-authored-by: Stephen Toub <stoub@microsoft.com>
* Fix Activity.Current nulled during streaming Fixes #7320 When an invoke_agent span with a name suffix is the current activity (e.g. "invoke_agent MyAgent(id)"), CurrentActivityIsInvokeAgent returns true and the orchestrate_tools activity is not created. The local activity variable is null, and all Activity.Current = activity workaround sites for dotnet/runtime#47802 set Activity.Current to null after each yield return. This disconnects subsequent spans from the trace. Capture the current activity before it can be lost and restore that value instead of null after each yield. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address review: guard with null check instead Use a null check around Activity.Current assignment instead of capturing a separate activityToRestore variable, per reviewer feedback. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientTests.cs --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Stephen Toub <stoub@microsoft.com>
* Introduce an ApiChief skill to streamline updating API baselines * Fix emit baseline description: YAML -> JSON API baseline ApiChief baselines are serialized as JSON (System.Text.Json), not YAML. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add cross-platform build.sh equivalent alongside build.cmd The build example was Windows-only; include ./build.sh for Linux/macOS. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix contains match to cover trailing segments The *.OpenAI.* pattern won't match names ending with OpenAI (e.g. Microsoft.Extensions.AI.OpenAI). Cover both middle and trailing segments. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add explicit wildcards to bare ME, MAD, MA alias expansions Without wildcards, bare expansions like 'Microsoft.Extensions' won't match any folder names via glob. Add trailing .* for consistency. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix subset exclusion examples in SKILL.md MED*/DataIngestion example was misleading since DataIngestion doesn't share a prefix with Diagnostics. Use accurate examples: MEAI*/MEAI.Eval* and MA*/MAD*. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update run-apichief skill: remove aliases, auto-detect TFM, allow overrides - Remove the shorthand alias system and subset exclusion rules - Note that users may provide shorthand library references - Auto-select highest net* TFM per library instead of hardcoding net10.0 - Report selected TFM and available targets before running - Allow per-library or blanket TFM overrides Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…rics in OpenTelemetryChatClient (#7325) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
* baselines regenerated * explanation: baseline are not tfm-aware; baselines not target latest and warning is disabled using pragma to target specific place only for net8- tfms --------- Co-authored-by: Tomáš Wiesner <tomaswiesner@microsoft.com>
…ental to stable (#7332) * experimental attribute removed from FakeLogCollector.GetLogsAsync(CancellationToken) * baseline: GetLogsAsync(CancellationToken) now stable --------- Co-authored-by: Tomáš Wiesner <tomaswiesner@microsoft.com>
* Add feature flag * Change options and add tests * Fix unit tests * Fix acceptance test * Fix typo in tests
* introduce support for the Gauge metric type * fix lint * update some of the gauge tests * remove old gauge resources * update tests * remove unusued diagnostics code * fix unit tests * additional gauge unit tests * fix nullable parts in the tests * remove gauge<t> tests * GaugeT support * add experimental attribute, PR fixes * temporal test updates * fix test warnings and update some tests * fix tests and formatting * more GaugeT_InvalidGenericType theory tests * fix PR comments
…I IChatClient implementations (#7319) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
…est (#7304) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
…1/260219) (#7339) * Initial plan * Update aiagent-webapi template to latest Agent Framework versions (rc1/260219) Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jeffhandley <1031940+jeffhandley@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Bumps [rollup](https://github.com/rollup/rollup) from 4.40.0 to 4.59.0. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v4.40.0...v4.59.0) --- updated-dependencies: - dependency-name: rollup dependency-version: 4.59.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…n pipeline YAML (#7347) * Initial plan * Replace vs2022preview queue images with vs2022 in YAML pipelines Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com>
…223.3 (#7351) On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 9.0.0-beta.26110.2 -> To Version 9.0.0-beta.26123.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
…only/params/scoped) (#7333) Co-authored-by: svick <287848+svick@users.noreply.github.com>
Co-authored-by: svick <287848+svick@users.noreply.github.com>
Contributor
Author
Fixed in ea89bcc. The merge incorrectly kept |
Collaborator
🎉 Good job! The coverage increased 🎉
Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1479492&view=codecoverage-tab |
adamsitnik
approved these changes
Jun 24, 2026
adamsitnik
left a comment
adamsitnik
left a comment
Member
There was a problem hiding this comment.
LGTM, since it's a feature branch sync (from main, not to main), I am going to merge it as is without bothering others for reviews.
Collaborator
🎉 Good job! The coverage increased 🎉
Full code coverage report: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1479755&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.
Syncs
data-ingestion-preview2with latestmain(171 commits).Conflict resolutions
data-ingestion-preview2anddevbranch triggersMicrosoftSemanticKernelConnectorsVersionproperty (per Fix SQLitePCLRaw.lib.e_sqlite3 vulnerability by replacing SemanticKernel connectors with CommunityToolkit #7579)System.Linq.AsyncEnumerable10.0.5CommunityToolkit.VectorData.SqliteVec1.0.0-preview.3 + SQLitePCLRaw 3.0.3 + MCP 1.2.0 +System.Linq.AsyncEnumerableUpdate 10.0.6 from main (per Fix SQLitePCLRaw.lib.e_sqlite3 vulnerability by replacing SemanticKernel connectors with CommunityToolkit #7579)IngestionChunkAPI introduced in [MEDI] Make the IngestionChunk non-generic #7557; added missingusingdirectives for CommunityToolkit packagesAdditional fixes
Microsoft.Bcl.MemoryPackageReference fromMicrosoft.Extensions.DataIngestion.csprojMicrosoft Reviewers: Open in CodeFlow