Skip to content

Merge master into live#4459

Merged
BillWagner merged 10 commits intolivefrom
publish-23342
Jul 1, 2020
Merged

Merge master into live#4459
BillWagner merged 10 commits intolivefrom
publish-23342

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 <[email protected]>

* Apply suggestions from code review

Co-authored-by: Maira Wenzel <[email protected]>

Co-authored-by: v-susu <[email protected]>
Co-authored-by: Maira Wenzel <[email protected]>
* 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 <[email protected]>

* Apply suggestions from code review

Co-authored-by: Karel Zikmund <[email protected]>
Co-authored-by: Maira Wenzel <[email protected]>

* Documentation

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

Co-authored-by: Maira Wenzel <[email protected]>

* RP comments

Co-authored-by: Maira Wenzel <[email protected]>
Co-authored-by: Jan Jahoda <[email protected]>
Co-authored-by: Karel Zikmund <[email protected]>
* CI Update

* manual fix

* manual fix

* manual fix

Co-authored-by: VSC-Service-Account <[email protected]>
* 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 <[email protected]>

Co-authored-by: Maira Wenzel <[email protected]>
@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