update System.CommandLine to the latest version#6340
Merged
adamsitnik merged 4 commits intodotnet:mainfrom Jun 30, 2023
Merged
Conversation
5 tasks
adamsitnik
added
the
do-not-merge
vlada-shubina
approved these changes
Apr 3, 2023
Member
|
/backport to release/7.0.4xx |
Contributor
|
Started backporting to release/7.0.4xx: https://github.com/dotnet/templating/actions/runs/4597034024 |
Contributor
|
@vlada-shubina backporting to release/7.0.4xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: update System.CommandLine to the latest version
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
M eng/Versions.props
A test/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/ValidateCommandTests.cs
M tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
A tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/validate/ValidateCommand.cs
M tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs
M tools/Microsoft.TemplateSearch.TemplateDiscovery/Program.cs
Falling back to patching base and 3-way merge...
Auto-merging tools/Microsoft.TemplateSearch.TemplateDiscovery/Program.cs
CONFLICT (content): Merge conflict in tools/Microsoft.TemplateSearch.TemplateDiscovery/Program.cs
Auto-merging tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs
CONFLICT (modify/delete): tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/validate/ValidateCommand.cs deleted in HEAD and modified in update System.CommandLine to the latest version. Version update System.CommandLine to the latest version of tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/validate/ValidateCommand.cs left in tree.
Auto-merging tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
CONFLICT (content): Merge conflict in tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
CONFLICT (modify/delete): test/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/ValidateCommandTests.cs deleted in HEAD and modified in update System.CommandLine to the latest version. Version update System.CommandLine to the latest version of test/Microsoft.TemplateEngine.Authoring.CLI.UnitTests/ValidateCommandTests.cs left in tree.
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 update System.CommandLine to the latest version
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! |
Contributor
|
@vlada-shubina an error occurred while backporting to release/7.0.4xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Member
|
@GangWang01 could you please backport to release/7.0.4xx? thank you |
YuliiaKovalova
approved these changes
Apr 3, 2023
Member
|
Hi @adamsitnik, please notify us when this PR is ready to be merged |
# Conflicts: # tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/Verify/VerifyCommand.cs
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
No description provided.