Allow VS using repository SDK to build for latest TFM #4128
Conversation
This file contains 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
jander-msft
added
the
backport
ghost
added
dependencies
schmittjoseph
approved these changes
Apr 5, 2023
|
/backport to release/7.1 |
|
/backport to release/6.x |
|
Started backporting to release/7.1: https://github.com/dotnet/dotnet-monitor/actions/runs/4622751726 |
|
Started backporting to release/6.x: https://github.com/dotnet/dotnet-monitor/actions/runs/4622752639 |
|
@jander-msft backporting to release/6.x failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/5de80f07b05ec48d0f55c059a5fdb80001ae6af3.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/5de80f07b05ec48d0f55c059a5fdb80001ae6af3.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Applying: Allow VS using repository SDK to build for latest TFM (#4128)
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow VS using repository SDK to build for latest TFM (#4128)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/dotnet-monitor/actions/runs/4622825101 |
jander-msft
pushed a commit
that referenced
this pull request
Apr 6, 2023
jander-msft
pushed a commit
that referenced
this pull request
Apr 6, 2023
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.
Summary
Manual backport of #4123 to
release/7.xRelease Notes Entry