Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Microsoft.IO.Redist package version #15016

Merged
merged 1 commit into from
Aug 21, 2024

Conversation

riarenas
Copy link
Member

@riarenas riarenas commented Aug 21, 2024

Related issue: dotnet/dnceng#3337

This dependency comes transitively from Microsoft.build, which hasn't updated their dependency from 6.0.0, so force this patch bump.

(It might be better to wait for this fix in msbuild if we're OK with sitting on the issue until that happens)

To double check:

@riarenas riarenas merged commit a3756ed into dotnet:main Aug 21, 2024
11 checks passed
@riarenas
Copy link
Member Author

/backport to release/8.0

Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/10510405411

Copy link
Contributor

@riarenas backporting to release/8.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: add Microsoft.IO.Redist package version
Using index info to reconstruct a base tree...
A	Directory.Packages.props
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): Directory.Packages.props deleted in HEAD and modified in add Microsoft.IO.Redist package version. Version add Microsoft.IO.Redist package version of Directory.Packages.props left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 add Microsoft.IO.Redist package version
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@riarenas an error occurred while backporting to release/8.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants