Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'main' => 'dev' #6191

Merged
merged 7 commits into from
Mar 27, 2025
Merged

[automated] Merge branch 'main' => 'dev' #6191

merged 7 commits into from
Mar 27, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 25, 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

Also includes
- Support for measuring and logging diagnostic data related to caching, latency and token usage for all LLM turns involved in each evaluation.
- Report generation changes to view and filter scenarios by the tags above, and to display the above usage statistics under each scenario in the tree.
- Changes to make some previously public types internal to avoid public API bloat.
- Other miscellaneous bug fixes and improvements in the report generation and display.

Fixes #6034 and #5970
@github-actions github-actions bot requested a review from a team as a code owner March 25, 2025 16:55
shyamnamboodiripad and others added 4 commits March 25, 2025 20:26
* Without the background color on the header, scrolling the report was causing the header portion to become transparent when the report was scrolled.
* Also moved the filterable tags into the header per earlier feedback.
…AI.Evaluation.Reporting/TypeScript (#6190)

* Bump vite

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.2 to 6.2.3.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.2.3/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.2.3/packages/vite)

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

Signed-off-by: dependabot[bot] <[email protected]>

* Fix package-lock.json

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Waldschmidt <[email protected]>
…6193)

* Enable new AIFunctionFactory.Create overload to use Activator{Utilities}.Create

Adds a Create overload that takes a target type and a MethodInfo. Each invocation of the AIFunction will create/dispose of a new instance, from DI if an IServiceProvider is provided, or via new() otherwise.
@github-actions github-actions bot requested a review from a team as a code owner March 26, 2025 14:42
* remove experimental from TagNameAttribute
@github-actions github-actions bot requested a review from a team as a code owner March 26, 2025 20:18
…ion to only official builds (#6041)

* Fix load order of ProjectStaging and restrict package version validation to only official builds
* Add "validation" branch which mirrors "release" but can be deleted
* Revert "Merged PR 48132: Flowing dependencies and getting ready for 9.3 release"
  This reverts commit 092d941.
@github-actions github-actions bot requested review from a team as code owners March 26, 2025 23:32
@RussKie RussKie merged commit 2a258ba into dev Mar 27, 2025
10 checks passed
@RussKie RussKie deleted the merge/main-to-dev branch March 27, 2025 05:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants