Exclude reference packages from CG#1134
Merged
MichaelSimons merged 1 commit intodotnet:mainfrom Jan 28, 2025
Merged
Conversation
mthalman
approved these changes
Jan 28, 2025
Member
mthalman
left a comment
There was a problem hiding this comment.
Should we also revert the manual edits to the projects to reference non-vulnerable versions?
Member
Author
I am planning on doing that in a separate PR (I should have called it out). I want to keep this simple to make it easy to backport. I do not plan on backporting any regen. |
Member
Author
|
/backport to release/9.0 |
Member
Author
|
/backport to release/8.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/source-build-reference-packages/actions/runs/13017542314 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/source-build-reference-packages/actions/runs/13017545088 |
Contributor
|
@MichaelSimons 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: Exclude reference packages from CG
Using index info to reconstruct a base tree...
M README.md
M azure-pipelines/builds/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines/builds/ci.yml
CONFLICT (content): Merge conflict in azure-pipelines/builds/ci.yml
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
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 Exclude reference packages from CG
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@MichaelSimons 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: Exclude reference packages from CG
Using index info to reconstruct a base tree...
M README.md
M azure-pipelines/builds/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines/builds/ci.yml
CONFLICT (content): Merge conflict in azure-pipelines/builds/ci.yml
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
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 Exclude reference packages from CG
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
MichaelSimons
added a commit
to MichaelSimons/source-build-reference-packages
that referenced
this pull request
Jan 28, 2025
MichaelSimons
added a commit
to MichaelSimons/source-build-reference-packages
that referenced
this pull request
Jan 28, 2025
MichaelSimons
added a commit
that referenced
this pull request
Jan 28, 2025
* Exclude reference packages from CG (#1134) * Revert debug setting
MichaelSimons
added a commit
that referenced
this pull request
Jan 28, 2025
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
2 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.
Fixes dotnet/source-build#4838