[manual] Merge branch 'release/7.0' => 'release/7.0-staging' #84457
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
…23.1 (#83860) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: carlossanlop <[email protected]>
…05.1 (#84361) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.5 -> To Version 7.0.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsCreating this PR manually because dotnet-maestro-bot is not being nice and is refusing to refresh the automated PR with the branding commit from the base release branch: #84336 I'll close the automated PR after merging this one, if no one objects to this workaround.
|
Contributor
Author
|
Hmm... I think I should submit this PR from a snapped branch, not from release/7.0 directly. Otherwise I don't know what would happen with the merge conflict resolution. |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Creating this PR manually because dotnet-maestro-bot is not being nice and is refusing to refresh the automated PR with the branding commit from the base release branch: #84336
I'll close the automated PR after merging this one, if no one objects to this workaround.