Skip to content

Conversation

@safern
Copy link
Member

@safern safern commented Nov 10, 2020

Fixes: #44480

@ViktorHofer
Copy link
Member

Merging to unblock CI.

@ViktorHofer ViktorHofer merged commit dcb04d7 into dotnet:master Nov 10, 2020
@safern safern deleted the UpdateDrawingHarvestPackage branch November 10, 2020 19:58
@ViktorHofer
Copy link
Member

@safern I assume we need to backport the change to 5.0?

@safern
Copy link
Member Author

safern commented Nov 10, 2020

/backport to release/5.0

@safern
Copy link
Member Author

safern commented Nov 10, 2020

@safern I assume we need to backport the change to 5.0?

Yeah

@github-actions
Copy link
Contributor

Started backporting to release/5.0: https://github.com/dotnet/runtime/actions/runs/356523381

@github-actions
Copy link
Contributor

@safern backporting to release/5.0 failed, the patch most likely resulted in conflicts:

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

Applying: Update System.Drawing.Common stable versions to fix harvesting
error: sha1 information is lacking or useless (src/libraries/pkg/baseline/packageIndex.json).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update System.Drawing.Common stable versions to fix harvesting
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 128

Please backport manually!

@ericstj
Copy link
Member

ericstj commented Nov 10, 2020

One thought here for how we make this less breaking: what if we only turn this on for release branches? Thoughts @joperezr / @Anipik?

@safern
Copy link
Member Author

safern commented Nov 10, 2020

I think that would work as whenever we branch for a preview or a release we turn it off and it will fail to remind us to update this. However, daily built packages could be broken.

@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Libraries AllConfigurations leg failing

3 participants