Use live M.Bcl.AsyncInterfaces dependency #94451
Conversation
dotnet-issue-labeler
bot
added
the
needs-area-label
|
Yes, we should backport this into release/8.0. I would even go as far as releasing a 8.0.1 version of Microsoft.Bcl.TimeProvider. |
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/6784746659 |
|
@ViktorHofer backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Use live M.Bcl.AsyncInterfaces dependency
Using index info to reconstruct a base tree...
M src/libraries/Microsoft.Bcl.TimeProvider/ref/Microsoft.Bcl.TimeProvider.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Bcl.TimeProvider/ref/Microsoft.Bcl.TimeProvider.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Bcl.TimeProvider/ref/Microsoft.Bcl.TimeProvider.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use live M.Bcl.AsyncInterfaces dependency
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! |
|
@ViktorHofer an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
Here's the manual backport: #94459 |
ViktorHofer
added
area-System.DateTime
and removed
needs-area-label
|
Tagging subscribers to this area: @dotnet/area-system-datetime Issue DetailsMicrosoft.Bcl.AsyncInterfaces is still built in the main branch and shouldn't be brought in as a prebuilt by the TimeProvider project.
|
* [release/8.0-staging] Use live M.Bcl.AsyncInterfaces dependency Manual backport of #94451 * Update Microsoft.Bcl.TimeProvider.csproj * Update Microsoft.Bcl.TimeProvider.csproj * Update Microsoft.Bcl.TimeProvider.csproj
ghost
locked as resolved and limited conversation to collaborators
Microsoft.Bcl.AsyncInterfaces is still built in the main branch and shouldn't be brought in as a prebuilt by the TimeProvider project.