Skip to content

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 git@github.com: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 git@github.com:dotnet-maestro-bot/AspNetCore merge/release/5.0-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.

BrennanConroy and others added 9 commits August 19, 2020 12:31
As per the announcement on dotnet#12890, avoid shipping this package in 5.0.
* Fix Http/3 and mark multiplexed factory as experimental

* mark apis as internal and delete quic samples

* Remove extra public api

* Mark kestrel server as obsolete

* Fixing obsoletion and improved message

* Revert "Fixing obsoletion and improved message"

This reverts commit acdae87.

* Revert "Mark kestrel server as obsolete"

This reverts commit fbd861f.

* Internalize SocketCOnnectionFactory

* nit

* fixup
…tnet#25011)

* Make OnNavigateAsync EventCallback and cancel previous navigation

* Add more tests
…otnet#25049)

[release/5.0] Update dependencies from dotnet/arcade dotnet/efcore
- Updates:
  - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6
  - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6

- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - dotnet-ef: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20419.5 to 5.0.0-rc.1.20419.12
)

* Throw original exception if exception handler is not found
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/5.0-to-master branch from e5bf53e to 4c381e8 Compare August 20, 2020 09:48
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Aug 20, 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 Aug 20, 2020
@ghost
Copy link

ghost commented Aug 20, 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.

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@ghost ghost removed the auto-merge label Aug 20, 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.

1 similar comment
@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.

@BrennanConroy BrennanConroy merged commit 4ecde5f into dotnet:master Aug 20, 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.

6 participants