extensions icon indicating copy to clipboard operation
extensions copied to clipboard

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

Open github-actions[bot] opened this issue 8 months ago • 4 comments

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:

  • evgenyfedorov2
  • joperezr
  • stephentoub
  • peterwald
  • RussKie

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

:warning: 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

github-actions[bot] avatar Apr 09 '25 07:04 github-actions[bot]

@joperezr @RussKie Is this PR still needed? Should we update it to include commits for the next release?

shyamnamboodiripad avatar May 08 '25 20:05 shyamnamboodiripad

This branch targets .NET 10, it's not a super high prio, but yes the tests need to be updated to get it green :) If you spare cycles and you're willing to help - great, otherwise I'll get it fixed next week some time. Thank you for alerting me to the failure.

RussKie avatar May 09 '25 00:05 RussKie

@shyamnamboodiripad could you please take a look again if you have time? Some AI templates test are failing...

evgenyfedorov2 avatar Jul 07 '25 13:07 evgenyfedorov2

@evgenyfedorov2 @RussKie I am unfortunately not very familiar with the AI templates tests. Perhaps @MackinnonBuck or @jeffhandley would be able to help for these?

shyamnamboodiripad avatar Jul 09 '25 18:07 shyamnamboodiripad