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' #6133

Closed
wants to merge 25 commits into from
Closed

Conversation

github-actions[bot]
Copy link
Contributor

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

  • makazeu
  • RussKie
  • danmoseley
  • danielwinkler
  • stephentoub
  • MackinnonBuck
  • shyamnamboodiripad
  • amadeuszl

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

makazeu and others added 10 commits March 14, 2025 08:04
* Memory usage in Slice path could be 0

* Update memory usage test to handle zero values and refine method name

* Update error message for memory usage exception to clarify non-negative expectation

* Merge test cases
* Add options to log unsupported routes

* Refactor

* Refactor

* Refactor
The fix ensures that the root level of the scenario tree is expanded by default when the report is opened.

Also includes a change to ensure that we collapse single child nodes only once right after the tree is constructed, plus a couple of other minor tweaks.

---------

Co-authored-by: Peter Waldschmidt <[email protected]>
* Add AsChatClient for OpenAIResponseClient

* Address feedback
…ng (#6064)

* Use strict by default for OpenAI schemas

* Fix up remaining places that handle strict

---------

Co-authored-by: Daniel Winkler <[email protected]>
Co-authored-by: Stephen Toub <[email protected]>
@github-actions github-actions bot requested review from a team as code owners March 17, 2025 09:02
stephentoub and others added 5 commits March 17, 2025 06:36
The CreateFunctionJsonSchema method includes all parameters in the schema. If someone wants to exclude a parameter, e.g. because the LLM shouldn't recognize that parameter and the value for the argument will instead come from somewhere else when the function is invoked, there's no good way to achieve that while still using this helper.

This PR adds an IncludeParameter filter to the create options, such that a developer can supply a delegate invoked for each ParameterInfo to declare whether that parameter should be included or not.
…314.2 (#6131)

[main] Update dependencies from dotnet/arcade


 - Merge branch 'main' into darc-main-289350a0-a0a2-46cd-9ff0-6b70b2a619ee
@RussKie RussKie force-pushed the merge/main-to-dev branch from 5f82075 to 8002436 Compare March 18, 2025 00:18
Fixes an issue where versions in package references to just-built packages were not always being scrubbed correctly.

Prior to this PR, specific version suffixes (-ci, -dev) were scrubbed, but this new PR takes a more robust approach that looks for <PackageReference /> items to just-built packages and scrubs the suffix of the Version attribute.

There's a static field _packagePrefixesWithJustBuiltVersionNumber that can be extended with more package prefixes that are expected to have a just-built version number.

If we're willing to be less conservative, we could even go even further and scrub any references to Microsoft.Extensions.* packages.

Fixes #6128
@RussKie
Copy link
Member

RussKie commented Mar 18, 2025

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@RussKie
Copy link
Member

RussKie commented Mar 18, 2025

@dotnet/dotnet-extensions-ai-evaluation the build is consistently failing with:

##[error].dotnet\sdk\10.0.100-preview.3.25125.5\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.PackTool.targets(98,5): error MSB4018: (NETCORE_ENGINEERING_TELEMETRY=Build) The "GenerateToolsSettingsFile" task failed unexpectedly.
System.IO.IOException: The process cannot access the file 'D:\a\_work\1\s\artifacts\obj\Microsoft.Extensions.AI.Evaluation.Console\DotnetToolSettings.xml' because it is being used by another process.

https://dev.azure.com/dnceng-public/public/_build/results?buildId=983928&view=logs&j=0bc77094-9fcd-5c38-f6e4-27d2ae131589&t=6855de19-1b6b-5827-d497-afac4c3d6da1

iliar-turdushev and others added 2 commits March 18, 2025 09:53
…e log record (#6111)

* Fixes #5720

Now {OriginalFormat} is emitted as the last item in the TagArray

* Fixes #5720

Adjusts ExtendedLogger to always return {OriginalFormat} as the last tag in the list

* Fixes #5720

Fixes ResourceMonitoring tests

* Fixes #5720

Address PR comments
* HybridCache: richer detection for field-only types (ref STJ)

fix dotnet/aspnetcore#60934

* as per PR notes: only apply field-only test versus the *default* options instance

* add dictionary test
Update instructions how to fix a compatibility issue with App Insights
@peterwald
Copy link
Member

I think this is a bug in the SDK, but temporarily I have made a change to only ship the tool compiled for net8. #6148

@peterwald
Copy link
Member

Filed bug dotnet/sdk#47696

@RussKie
Copy link
Member

RussKie commented Mar 18, 2025

I think this is a bug in the SDK, but temporarily I have made a change to only ship the tool compiled for net8. #6148

Thank you @peterwald, let's see if it fixes the build

@RussKie RussKie requested review from a team as code owners March 18, 2025 21:36
@RussKie RussKie closed this Mar 18, 2025
@RussKie RussKie deleted the merge/main-to-dev branch March 18, 2025 21:37
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.