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

Merged
merged 5 commits into from
Dec 19, 2023

Conversation

dotnet-maestro-bot
Copy link
Contributor

@dotnet-maestro-bot dotnet-maestro-bot commented Dec 19, 2023

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:

  • sebastienros
  • joperezr
  • geeknoid

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-maestro-bot/Common HEAD:merge/main-to-dev
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/Common 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.

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

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Microsoft Reviewers: Open in CodeFlow

geeknoid and others added 5 commits December 11, 2023 14:10
…uments. (dotnet#4798)

* Fix dotnet#4795

And while I was in the neighborhood, also addresses dotnet#4637

---------

Co-authored-by: Martin Taillefer <[email protected]>
Co-authored-by: Igor Velikorossov <[email protected]>
The logging code generator emits a static lambda. The lambda's containing
function is annotated with the [GeneratedCode] attribute, but the lambda
itself is not. The result is that code generators can get confused,
considering the lambda as being user code.

This PR adds the [GeneratedCode] attribute to the lambda.

Co-authored-by: Martin Taillefer <[email protected]>
* Add more information and sample to Http.Diagnostics Readme

* Simplify first statement and adding using statements.

* Also add extra docs to xml docs
@sebastienros
Copy link
Member

@RussKie well, didn't expect that, that's convenient.

@RussKie RussKie merged commit 6db5bd4 into dotnet:dev Dec 19, 2023
5 of 6 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jan 19, 2024
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.

5 participants