Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 10, 2025

I detected changes in the main branch which have not been merged yet to dev. I'm a robot and am configured to help you automatically keep dev up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • shyamnamboodiripad

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout dev
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/extensions HEAD:merge/main-to-dev
or if you are using SSH
git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-dev'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-dev origin/dev
git pull https://github.com/dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/extensions HEAD:merge/main-to-dev
or if you are using SSH
git fetch
git checkout -b merge/main-to-dev origin/dev
git pull [email protected]:dotnet/extensions merge/main-to-dev
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/extensions HEAD:merge/main-to-dev

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

Microsoft Reviewers: Open in CodeFlow

…5998) to include `ChatResponse` (which can contain multiple `ChatMessage`s) in place of a single `ChatMessage`. Unfortunately, we missed updating the TypeScript reporting code to account for this. (#6061)

This change fixes the problem by updating the deserialization code in TypeScript to match what .NET code serializes.
@github-actions github-actions bot requested a review from a team as a code owner March 10, 2025 18:42
@github-actions github-actions bot requested a review from a team as a code owner March 10, 2025 20:48
* Move GetService down to a non-generic IEmbeddingGenerator interface

* Separate UriContent from DataContent

* Address feedback
@github-actions github-actions bot requested a review from a team as a code owner March 10, 2025 22:04
@RussKie RussKie enabled auto-merge March 10, 2025 22:56
@RussKie RussKie merged commit 0445de1 into dev Mar 10, 2025
8 checks passed
@RussKie RussKie deleted the merge/main-to-dev branch March 10, 2025 22:56
@github-actions github-actions bot locked and limited conversation to collaborators Apr 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants