Skip to content

[automated] Merge branch 'release/5.0' => 'master' #26559

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

Merged

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/5.0 by the following committers:

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 release/5.0
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0

# 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/AspNetCore HEAD:merge/release/5.0-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-to-master

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/release/5.0-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

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.

pranavkm and others added 6 commits October 2, 2020 13:12
* Add docs for Auth, Auth.Cookies, Auth.Certificate

Contributes to dotnet#26397

* Also add JWT

* Apply suggestions from code review

Co-authored-by: Hao Kung <[email protected]>
Co-authored-by: Chris Ross <[email protected]>

* Update src/Security/Authentication/Core/src/TicketSerializer.cs

* Update src/Security/Authentication/Core/src/TicketSerializer.cs

* Update src/Security/Authentication/Core/src/TicketSerializer.cs

* Apply suggestions from code review

Co-authored-by: Hao Kung <[email protected]>
Co-authored-by: Chris Ross <[email protected]>
* Turn on doc warnings

* Api ref stuff

* Add api docs

* Api docs

* Missing docs

* Add docs

* Update src/Components/WebAssembly/WebAssembly.Authentication/src/Services/ExpiredTokenException.cs

Co-authored-by: Pranav K <[email protected]>

Co-authored-by: Pranav K <[email protected]>
* Api docs for HttpOverrides

* Update ForwardedHeadersExtensions.cs

* Update ForwardedHeadersOptions.cs

* Feedback

* Add more details

Co-authored-by: Pranav K <[email protected]>
* Api docs for Diagnostics middlewares

* Update ExceptionHandlerFeature.cs

* Update StatusCodePagesMiddleware.cs

* Update ExceptionHandlerMiddleware.cs

* Apply suggestions from code review

Co-authored-by: Pranav K <[email protected]>

Co-authored-by: Pranav K <[email protected]>
* Don't close connections after upgrade requests without a 101 response

* Add test

* Add DefautCredentials_WebSocket_Success
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/5.0-to-master branch from 9650fc0 to 96c082f Compare October 2, 2020 21:50
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Oct 2, 2020
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost ghost added the auto-merge label Oct 2, 2020
@ghost
Copy link

ghost commented Oct 2, 2020

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@wtgodbe
Copy link
Member

wtgodbe commented Oct 2, 2020

src/Middleware/Diagnostics/src/StatusCodePage/StatusCodePagesExtensions.cs(194,43): error CS8601: (NETCORE_ENGINEERING_TELEMETRY=Build) Possible null reference assignment.

@pranavkm @JunTaoLuo could you take a look?

…otnet#26551)

[release/5.0] Update dependencies from dotnet/runtime dotnet/efcore
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

…1002.8 (dotnet#26568)

[release/5.0] Update dependencies from dotnet/runtime
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@pranavkm pranavkm force-pushed the merge/release/5.0-to-master branch from 114403e to 2030c5c Compare October 5, 2020 17:57
@pranavkm pranavkm added this to the 6.0.0-alpha1 milestone Oct 5, 2020
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@pranavkm pranavkm merged commit 4fdc35d into dotnet:master Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants