[automated] Merge branch 'release/5.0-preview3' => 'master'

[dotnet-maestro-bot]

I detected changes in the release/5.0-preview3 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-preview3 by the following committers:

• @BrennanConroy
• @dotnet-maestro[bot]

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.

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

# 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-preview3-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-preview3-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-preview3-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-preview3-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-preview3-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-preview3-to-master

or if you are using SSH

git checkout -b merge/release/5.0-preview3-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-preview3-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-preview3-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.

[ghost]

Auto-approving branch merge.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @dotnet-maestro[bot]
• @BrennanConroy

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-preview3, but I could not automatically push those to merge/release/5.0-preview3-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.

[dougbu]

@jkotalik when you did the merge in this PR, why did so many dependency versions change? The other bits look reasonable -- especially given we haven't updated Arcade in 'master' as recently as in the preview branch. But, …

[jkotalik]

None of these dependencies are actually updating, it's just the way the merge looks in this PR. As you can see, there are commits from master "in" this PR, however, when we merge this into master, only the commits that aren't in master will be merged.

This behavior happens by default when doing the suggested "Instructions for updating this pull request". I usually need to redo the merge (exact same steps) with a force push at the end to "fix" the PR. However, it doesn't actually change the end merge, just the way it looks in the PR.

[dougbu]

@jkotalik sounds good.

@rynowak I haven't looked at what this PR really changes. It's likely ready to go. But, may be best to confirm Arcade has updated in 'master' "naturally" and not in this PR. That's just because dependency update PRs are where we go looking for real changes.

[jkotalik]

I think this will end up being a noop merge. The only changes are: 96e69d3, and I didn't actually updated them because master has already passed those versions: c378f3f#diff-5c6a1c77fe216efcfbbdccb11b863063R16

Again, if you'd prefer, I can redo this PR to make it look cleaner, however, we need to wait another two hours for the build to pass before merging.

[rynowak]

Again, if you'd prefer, I can redo this PR to make it look cleaner, however, we need to wait another two hours for the build to pass before merging.

Let's not and say we did.

[dougbu]

Agree w/ letting this one ride. I double-checked the changes using git merge-base git merge-base origin/master dotnet-maestro-bot/merge/release/5.0-preview3-to-master and git diff 96e69d3ae19255a128c888250707dacc1226a937..dotnet-maestro-bot/merge/release/5.0-preview3-to-master. Nothing changed except (as expected) HubConnection.cs, HttpConnection.cs, and related tests.

[rynowak]

And so it came to pass.