[automated] Merge branch 'release/3.1' => 'master' #2864

dotnet-maestro-bot · 2020-01-15T18:41:57Z

I detected changes in the release/3.1 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/3.1 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/3.1
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.1-to-master master
git pull https://github.com/dotnet-maestro-bot/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

or if you are using SSH

git checkout -b merge/release/3.1-to-master master
git pull [email protected]:dotnet-maestro-bot/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

- no-op merge

…0200114.3 (dotnet#2865) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

dotnet-maestro-bot · 2020-01-15T21:13:05Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

dotnet-maestro-bot · 2020-01-16T00:41:20Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

…0200115.5 (dotnet#2867) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

dotnet-maestro-bot · 2020-01-16T02:02:30Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

…0200115.9 (dotnet#2868) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

dotnet-maestro-bot · 2020-01-16T03:43:54Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

* Update dependencies from https://github.com/dotnet/core-setup build 20200115.10 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.10 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.12 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200115.14 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.14 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 * Update dependencies from https://github.com/dotnet/core-setup build 20200116.1 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

dotnet-maestro-bot · 2020-01-16T14:58:17Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

Fixes: dotnet#2077 In 3.0 we introduced validation to try and prevent some cases of invalid usage on the factory that had lead to user bug reports. Unfortunately we blocked a few legitimate usage scenarios behind expections. In this case the common usage is for a library to register a typed client with `AddHttpClient<MyClient>(...)`. User code can then collaborate by calling the same thing, and interacting with the builder that's returned. This change explicitly allows this pattern by fine-tuning the validation.

Fixes: dotnet/aspnetcore#13346 In 3.0 we added validation to try and report exceptions for some common HttClient factory usage mistakes in the registration code. Unfortunately we blocked from legitimate usage cases. In this case, users are blocked from associating multiple types with the same logical 'name'. Ex: ```C# services.AddHttpClient("Foo").AddTypedClient<A>().AddTypedClient<B>(); ``` This is useful and should be allowed because it's a good way to DRY up configuration code. ---- This change relaxes the validation when `AddTypedClient` is called, but not when `AddHttpClient` is called without supplying a name. We still want to block cases like the following: ```C# services.AddHttpClient<A.SomeClient>(); services.AddHttpClient<B.SomeClient>(); ``` The type short name is used as the logical name for the client (named options) so usage like this is always a bug.

Also reported as part of dotnet#2077 In this pattern users register many instances of the same client with different configurations, and multiplex between them in a round-robin fashion.

…y-fixes Fixes for some servicing-proposed HttpClient Factory issues

dotnet-maestro-bot · 2020-01-16T17:57:45Z

This pull request has been updated.

This PR merges commits made on release/3.1 by the following committers:

…0115.4 (dotnet#2871) - NETStandard.Library.Ref - 2.1.0-alpha.1.20065.4 - Microsoft.NETCore.App.Internal - 5.0.0-alpha.1.20065.4 - Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.20065.4 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20065.4 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.Platforms - 5.0.0-alpha.1.20065.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)

…et-maestro-bot/Common into dotnet-maestro-bot-merge/release/3.1-to-master

dotnet-maestro-bot · 2020-01-16T20:21:27Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-to-master to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

…ge/release/3.1-to-master [automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from dotnet/extensions@dea81ef

…ge/release/3.1-to-master [automated] Merge branch 'release/3.1' => 'master' Commit migrated from dotnet/extensions@dea81ef

John Luo and others added 3 commits January 14, 2020 13:56

Update branding to 2.1.16 (dotnet#2842)

db2c38a

Merge branch 'release/2.1' into release/3.1

75371ae

Merge branch 'release/2.1' => 'release/3.1' (dotnet#2859)

3e617ba

- no-op merge

ghost added area-infrastructure labels Jan 15, 2020

Update dependencies from https://github.com/dotnet/core-setup build 2…

fde2846

…0200114.3 (dotnet#2865) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20064.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

dotnet-maestro-bot requested a review from dougbu as a code owner January 15, 2020 21:13

Remove ref project from Microsoft.AspNetCore.Testing (dotnet#2817)

b624d6b

dotnet-maestro-bot requested review from Tratcher and analogrelay as code owners January 16, 2020 00:41

Update dependencies from https://github.com/dotnet/core-setup build 2…

1541c04

…0200115.5 (dotnet#2867) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

Update dependencies from https://github.com/dotnet/core-setup build 2…

84214a0

…0200115.9 (dotnet#2868) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20065.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

rynowak and others added 5 commits January 16, 2020 08:05

WIP

9c9ac59

All duplicates of the same type with different names

edcf5f2

Also reported as part of dotnet#2077 In this pattern users register many instances of the same client with different configurations, and multiplex between them in a round-robin fashion.

Merge pull request dotnet#2710 from dotnet/rynowak/http-client-factor…

08a9b86

…y-fixes Fixes for some servicing-proposed HttpClient Factory issues

dotnet-maestro bot and others added 2 commits January 16, 2020 19:24

Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…

3873a07

…et-maestro-bot/Common into dotnet-maestro-bot-merge/release/3.1-to-master

rynowak approved these changes Jan 16, 2020

View reviewed changes

rynowak merged commit dea81ef into dotnet:master Jan 16, 2020

ghost locked as resolved and limited conversation to collaborators May 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.1' => 'master' #2864

[automated] Merge branch 'release/3.1' => 'master' #2864

Uh oh!

dotnet-maestro-bot commented Jan 15, 2020

Uh oh!

dotnet-maestro-bot commented Jan 15, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[automated] Merge branch 'release/3.1' => 'master' #2864

[automated] Merge branch 'release/3.1' => 'master' #2864

Uh oh!

Conversation

dotnet-maestro-bot commented Jan 15, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

dotnet-maestro-bot commented Jan 15, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

dotnet-maestro-bot commented Jan 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants