Create manifest installers and VS manifests #56308
Merged
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
This is a copy of dotnet/emsdk#50
directhex
added
the
NO-MERGE
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
directhex
removed
the
NO-MERGE
|
The right things are happening in the private build https://dev.azure.com/dnceng/internal/_build/results?buildId=1259362&view=results |
|
/backport to release/6.0-preview7 |
steveisok
approved these changes
Jul 26, 2021
|
Started backporting to release/6.0-preview7: https://github.com/dotnet/runtime/actions/runs/1069220553 |
|
@steveisok backporting to release/6.0-preview7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Create manifest installers and VS manifests
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
M eng/Versions.props
M src/workloads/workloads.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/workloads/workloads.csproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Create manifest installers and VS manifests
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 128Please backport manually! |
steveisok
pushed a commit
to steveisok/runtime
that referenced
this pull request
Jul 27, 2021
mmitche
pushed a commit
that referenced
this pull request
Jul 27, 2021
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.
This is a copy of dotnet/emsdk#50