8000 Merge master into live by cxwtool · Pull Request #4459 · dotnet/dotnet-api-docs · GitHub
[go: up one dir, main page]

Skip to content

Merge master into live #4459

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

Merged
merged 10 commits into from
Jul 1, 2020
Merged

Merge master into live #4459

merged 10 commits into from
Jul 1, 2020

Conversation

cxwtool
Copy link
@cxwtool cxwtool commented Jul 1, 2020

Please don't squash-merge this PR.

luyajun0205 and others added 10 commits June 30, 2020 01:09
* The 3rd batch patch for msdn url

* Apply suggestions from code review

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

Co-authored-by: v-susu <v-susu@microsoft.com>
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
* Add ctor doc

* AllowAutoRedirect doc

* Connect timeout doc

* Credentials doc

* SocketsHttpHandler.Expect100ContinueTimeout doc

* Update xml/System.Net.Http/SocketsHttpHandler.xml

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Karel Zikmund <karelz@microsoft.com>
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* Documentation

* Update xml/System.Net.Http/SocketsHttpHandler.xml

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* RP comments

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
Co-authored-by: Jan Jahoda <jajahoda@.microsoft.com>
Co-authored-by: Karel Zikmund <karelz@microsoft.com>
* CI Update

* manual fix

* manual fix

* manual fix

Co-authored-by: VSC-Service-Account <vscavu@microsoft.com>
* replace rijndael etc

* restore snippet tags

* address feedback

* AesManaged-->Aes
* hmacsha1-->hmacsha256

* fix exception text
* enable_try_dotnet_to_batch_12d

* Update xml/System/Exception.xml

Removing interactive

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
@dotnet-bot dotnet-bot added this to the July 2020 milestone Jul 1, 2020
@BillWagner BillWagner merged commit 3aefb2f into live Jul 1, 2020
@BillWagner BillWagner deleted the publish-23342 branch July 1, 2020 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants
0