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

Port System.Threading.Tasks source comments to Docs #2312

Merged
merged 11 commits into from May 20, 2019

Conversation

@carlossanlop
Copy link
Member

commented Apr 15, 2019

Summary

Automatically ported some missing comments found in System.Threading.Tasks that did not exist in dotnet-api-docs.

Fixes #Issue_Number (if available)

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented Apr 15, 2019

@mairaw please take a look whenever you get a chance.
Adding area owners @tarekgh, @stephentoub in case they have any additional comments.

@stephentoub
Copy link
Member

left a comment

Thanks.

@mairaw mairaw added this to In progress in April 2019 via automation Apr 16, 2019

@mairaw mairaw added this to the April 2019 milestone Apr 16, 2019

@mairaw
Copy link
Contributor

left a comment

Thanks @carlossanlop! Left some comments to be addressed and some questions.

mairaw and others added some commits Apr 16, 2019

Update xml/System.Threading.Tasks.Dataflow/BatchedJoinBlock`2.xml
Makes sense.

Co-Authored-By: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Update xml/System.Threading.Tasks.Dataflow/BatchedJoinBlock`2.xml
Makes sense. Thanks for the explanation.

Co-Authored-By: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Update xml/System.Threading.Tasks.Dataflow/DataflowBlockOptions.xml
Co-Authored-By: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Update xml/System.Threading.Tasks.Dataflow/DataflowBlockOptions.xml
Nice catch. This was not among the /// comments apparently.

Co-Authored-By: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Update xml/System.Threading.Tasks/Parallel.xml
Co-Authored-By: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented Apr 30, 2019

@mairaw @rpetrusha I don't have permission to resolve the conflict, only people with write access. Would you mind helping me resolve it?

@rpetrusha

This comment has been minimized.

Copy link
Contributor

commented Apr 30, 2019

I've resolved the merge conflict, @carlossanlop.

@mairaw

This comment has been minimized.

Copy link
Contributor

commented Apr 30, 2019

You should have write permissions to your own branch no?

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented May 1, 2019

@mairaw I couldn't see it. I clicked on "Files changed", looked for the lines with the alleged merge conflict, but couldn't see any lines with ">>>>>". I'm not sure what I missed.

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented May 1, 2019

If this looks good, can we get it merged?

@mairaw mairaw moved this from In progress to In Review in April 2019 May 6, 2019

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

@rpetrusha let me know if this can be merged

@rpetrusha

This comment has been minimized.

Copy link
Contributor

commented May 8, 2019

I've addressed another merge conflict. @mairaw, do you want to take a look and approve if this is ready to merge?

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented May 8, 2019

Thank you @rpetrusha for addressing the merge conflict. I didn't notice it, apologies.

mairaw added some commits May 13, 2019

@mairaw

mairaw approved these changes May 13, 2019

@carlossanlop

This comment has been minimized.

Copy link
Member Author

commented May 20, 2019

@mairaw @rpetrusha The build passed. Any chance you could merge this?

@rpetrusha rpetrusha merged commit c1b537c into dotnet:master May 20, 2019

6 checks passed

OpenPublishing.Build Validation status: passed
Details
OpenPublishing.Build (1 of 3) Waiting for processor completed at 16:26:37 PST
OpenPublishing.Build (2 of 3) Preparing completed at 16:42:29 PST
OpenPublishing.Build (3 of 3) Building completed at 17:13:02 PST
WIP Ready for review
Details
license/cla All CLA requirements met.
Details

April 2019 automation moved this from In Review to Done May 20, 2019

@carlossanlop carlossanlop deleted the carlossanlop:tasks branch May 23, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.