[automated] Merge branch 'release/3.1' => 'master' #21965
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avoid caching JsonSerializer
* Give .msi's non-stable branding * Add BuildNumber to version * Make GUIDInputs unique per-build
…/2.1-to-release/3.1 [automated] Merge branch 'release/2.1' => 'release/3.1'
…1330) * Update react dependencies * Update angular dependencies * Update react-redux dependencies
dotnet-maestro-bot
requested review from
BrennanConroy and
halter73
as code owners
dotnet-maestro-bot
force-pushed
the
merge/release/3.1-to-master
branch
from
91f7ff8 to
a9449cd
Compare
ghost
added
area-infrastructure
dotnet-maestro-bot
requested review from
dougbu,
jkotalik and
Tratcher
as code owners
Tratcher
force-pushed
the
merge/release/3.1-to-master
branch
from
2f51608 to
a9449cd
Compare
|
Force push reverted my manual merge conflict resolution, let's try that again... |
# Conflicts: # src/SignalR/clients/ts/FunctionalTests/yarn.lock # src/SignalR/clients/ts/signalr/src/NodeHttpClient.ts # src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts # src/SignalR/clients/ts/signalr/tests/TestWebSocket.ts
BrennanConroy
approved these changes
May 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/3.1 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/3.1 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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.