Skip to content

Merge main into live#24895

Merged
BillWagner merged 21 commits intolivefrom
publish-1763
Jun 29, 2021
Merged

Merge main into live#24895
BillWagner merged 21 commits intolivefrom
publish-1763

Conversation

@cxwtool
Copy link
Copy Markdown
Contributor

@cxwtool cxwtool commented Jun 29, 2021

Please don't squash-merge this PR.

azure-sdk and others added 21 commits June 28, 2021 07:17
* relative links

* delete orphaned images

* add back needed files
* Add some additional methods

* Add time series methods
Fix grammatical error
* Update cs0236.md

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: David Pine <david.pine@microsoft.com>
* Do something other than if/else if/else

* Apply suggestions from code review

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>

* Apply update to exhaustive case

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
* We may want to add more as they become available and applicable.

* Corrected URL, add missing /dotnet route prefix

* Add .NET language logos
* Update channel-credentials.md

Adding workaround for PEM loaded client certificates on Windows.

* Fix markdown errors

* Update channel-credentials.md

Making it clear when the workaround should be applied.

* Update docs/architecture/grpc-for-wcf-developers/channel-credentials.md

Fixing after code review.

Co-authored-by: Andy (Steve) De George <67293991+adegeo@users.noreply.github.com>

* Update docs/architecture/grpc-for-wcf-developers/channel-credentials.md

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update docs/architecture/grpc-for-wcf-developers/channel-credentials.md

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update docs/architecture/grpc-for-wcf-developers/channel-credentials.md

Co-authored-by: David Pine <david.pine@microsoft.com>

* Intro paras; formatting.

* Update channel-credentials.md

Co-authored-by: Andy (Steve) De George <67293991+adegeo@users.noreply.github.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
This clarifies that --version displays the SDK version, not the muxur version (the muxor is the actual dotnet.exe) after discovering that some very smart people were confused about this.

Co-authored-by: Kathleen Dollard <kdollard@microsoft.com>
* Pre-commit hook, applied automatic markdownlint CLI fixes

* Added disamibuation INCLUDE
@cxwtool cxwtool requested a review from BillWagner June 29, 2021 06:02
@dotnet-bot dotnet-bot added this to the July 2021 milestone Jun 29, 2021
@BillWagner BillWagner merged commit b286c01 into live Jun 29, 2021
@BillWagner BillWagner deleted the publish-1763 branch June 29, 2021 10:34
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.