[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #14723
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
…ncy in runtime. (dotnet#14697) * Remove llvm-project from source-build as we have removed this dependency in runtime. * Add patch for the backport PR to get this to build for now. * Remove unneeded copy of this patch.
[release/7.0.1xx] Update dependencies from dotnet/sdk - Remove backported command-line-api patch
* Don't use the MSBuild server process for init-build.proj. This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL. * Address code review feedback.
dotnet-maestro-bot
force-pushed
the
merge/release/7.0.1xx-to-release/7.0.2xx
branch
from
2650119 to
c516635
Compare
…dotnet#14728) * Update source-build to 7.0 RC2 * Also update tarball global.json * Don't touch root global.json in case it is managed by automation
Member
|
I think we want #14679 to flow in first. The build failure is because the latest command-line-api version hasn't flown in yet. |
…into merge/release/7.0.1xx-to-release/7.0.2xx
MichaelSimons
approved these changes
Nov 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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/7.0.1xx branch which have not been merged yet to release/7.0.2xx. I'm a robot and am configured to help you automatically keep release/7.0.2xx up to date, so I've opened this PR.
This PR merges commits made on release/7.0.1xx 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/7.0.1xx-to-release/7.0.2xx'. 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.