Dependabot will manage versions on main#17460
Merged
mattleibow merged 2 commits intomainfrom Sep 19, 2023
Merged
Conversation
Member
|
Should we add this as a group update on dependabot ? |
Member
Author
|
There is already. |
mattleibow
force-pushed
the
dev/ms.ext
branch
from
f4a4844 to
2bda69f
Compare
jsuarezruiz
approved these changes
Sep 19, 2023
Member
Author
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6237581089 |
Contributor
|
@mattleibow backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Dependabot will manage versions on main
Using index info to reconstruct a base tree...
M eng/Microsoft.Extensions.targets
M eng/Versions.props
M src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
CONFLICT (content): Merge conflict in src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Microsoft.Extensions.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Dependabot will manage versions on main
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
|
@mattleibow an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
mattleibow
added a commit
that referenced
this pull request
Sep 19, 2023
rmarinho
added a commit
that referenced
this pull request
Sep 20, 2023
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Description of Change
Instead of hard-coded numbers that never get updated, we can let the tool do the job.