Skip to content

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Jun 30, 2025

Fixes a CG alert. Needs to be backported to 8 & 9

@wtgodbe wtgodbe requested a review from a team as a code owner June 30, 2025 17:05
@wtgodbe wtgodbe requested a review from Copilot June 30, 2025 17:05
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates Microsoft.Build dependency versions to fix a CG alert, ensuring proper dependency versions for builds.

  • Updated Microsoft.BuildVersion, MicrosoftBuildFrameworkVersion, MicrosoftBuildTasksCoreVersion, and MicrosoftBuildUtilitiesCoreVersion to version 17.8.29.
  • Ensures consistency of dependency versions in the build configuration.

@github-actions github-actions bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jun 30, 2025
@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 30, 2025

/backport to release/9.0

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 30, 2025

/backport to release/8.0

Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/15979178650

Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/15979180584

Copy link
Contributor

@wtgodbe backporting to "release/9.0" failed, the patch most likely resulted in conflicts:

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

Applying: Update Microsoft.Build dependencies
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
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 set advice.mergeConflict false"
Patch failed at 0001 Update Microsoft.Build dependencies
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

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

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

Applying: Update Microsoft.Build dependencies
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
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 set advice.mergeConflict false"
Patch failed at 0001 Update Microsoft.Build dependencies
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@wtgodbe wtgodbe merged commit 1fe9483 into main Jun 30, 2025
29 checks passed
@wtgodbe wtgodbe deleted the wtgodbe/msbuild branch June 30, 2025 18:37
@dotnet-policy-service dotnet-policy-service bot added this to the 10.0-preview7 milestone Jun 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant