[automated] Merge branch 'master' => 'release/3.0' by dotnet-maestro-bot · Pull Request #1221 · dotnet/standard

dotnet-maestro-bot · 2019-05-31T19:09:04Z

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

This PR merges commits made on master 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 master
git pull --ff-only
git checkout release/3.0
git pull --ff-only
git merge --no-ff master

# 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/standard HEAD:merge/master-to-release/3.0

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/standard HEAD:merge/master-to-release/3.0

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/master-to-release/3.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

or if you are using SSH

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

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.

Update branding on master

…422.2 (dotnet#1165) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19222.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19222.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19222.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19222.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19222.2

…423.2 (dotnet#1167) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19223.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19223.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19223.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19223.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19223.2

…424.9 (dotnet#1168) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19224.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19224.9 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19224.9 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19224.9 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19224.9

…425.5 (dotnet#1169) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19225.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19225.5 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19225.5 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19225.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19225.5

* Update dependencies from https://github.com/dotnet/arcade build 20190426.3 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19226.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19226.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19226.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19226.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19226.3 * Update dependencies from https://github.com/dotnet/arcade build 20190429.8 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19229.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19229.8 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19229.8 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19229.8 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19229.8

This fixes dotnet#1171.

…506.12 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19256.12 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19256.12 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19256.12 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19256.12

Update to the 3.0 SDK

…sions Move WithCancellation/ConfigureAwait extension methods to TaskAsyncEnumerableExtensions

Prevent non-framework code from extending BaseNumberConverter

This fixes dotnet#1091.

…es to BAR (dotnet#1182) * Fix official build which is failing when trying to publish the packages to BAR * Fix parameter for publishing to BAR

Add bulk operations to Collection<T>

This is required for official builds in order for them to successfully be pushed to the blob feeds.

…510.2 (dotnet#1186) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19260.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19260.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19260.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19260.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19260.2

…511.1 (dotnet#1187) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19261.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19261.1 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19261.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19261.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19261.1

…512.1 (dotnet#1188) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19262.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19262.1 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19262.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19262.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19262.1

Update azure-pipelines.yml

…513.3 (dotnet#1191) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19263.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19263.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19263.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19263.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19263.3

Fail CI build if APICompat baseline files would change

…521.9 (dotnet#1204) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19271.9 - System.Reflection.Emit - 4.6.0-preview6.19271.9 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19271.9

* Update dependencies from https://github.com/dotnet/arcade build 20190514.13 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19264.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19264.13 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19264.13 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19264.13 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19264.13 * Update dependencies from https://github.com/dotnet/arcade build 20190516.2 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19266.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19266.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19266.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19266.2 * Update dependencies from https://github.com/dotnet/arcade build 20190516.4 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19266.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.4 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19266.4 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19266.4 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19266.4 * Update dependencies from https://github.com/dotnet/arcade build 20190517.7 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19267.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19267.7 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19267.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19267.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19267.7 * Update dependencies from https://github.com/dotnet/arcade build 20190518.2 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19268.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19268.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19268.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19268.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19268.2 * Update dependencies from https://github.com/dotnet/arcade build 20190520.1 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19270.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.1 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19270.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19270.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19270.1 * Update dependencies from https://github.com/dotnet/arcade build 20190520.2 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19270.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19270.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19270.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19270.2 * Update dependencies from https://github.com/dotnet/arcade build 20190521.7 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19271.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19271.7 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19271.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19271.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19271.7

…522.13 (dotnet#1205) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19272.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19272.13 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19272.13 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19272.13 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19272.13

…522.8 (dotnet#1206) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19272.8 - System.Reflection.Emit - 4.6.0-preview6.19272.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19272.8

…523.11 (dotnet#1207) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19273.11 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19273.11 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19273.11 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19273.11 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19273.11

…523.8 (dotnet#1208) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19273.8 - System.Reflection.Emit - 4.6.0-preview6.19273.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19273.8

…524.6 (dotnet#1210) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19274.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19274.6 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19274.6 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19274.6

…524.8 (dotnet#1211) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19274.8 - System.Reflection.Emit - 4.6.0-preview6.19274.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19274.8

…527.2 (dotnet#1213) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19277.2 - System.Reflection.Emit - 4.6.0-preview6.19277.2 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19277.2

…528.1 (dotnet#1215) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19278.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19278.1 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19278.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19278.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19278.1

* Use GenFacades for netstandard facade Previously this project was calling GenAPI itself, this can be removed and replaced with the source-based GenFacades which is effectively doing the same thing. I chose to just allow for missing types rather than explicitly call out all missing types since this information was redundant to the APICompat reports. * Exclude GenAPI and APICompat from source build

…529.5 (dotnet#1218) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19279.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19279.5 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19279.5 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19279.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19279.5 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19279.5

…530.2 (dotnet#1220) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19280.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19280.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19280.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19280.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19280.2 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19280.2

* Update dependencies from https://github.com/dotnet/corefx build 20190528.7 - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19278.7 - System.Reflection.Emit - 4.6.0-preview6.19278.7 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19278.7 * Update dependencies from https://github.com/dotnet/corefx build 20190529.8 - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19279.8 - System.Reflection.Emit - 4.6.0-preview6.19279.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19279.8 * Update dependencies from https://github.com/dotnet/corefx build 20190531.1 - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19281.1 - System.Reflection.Emit - 4.6.0-preview6.19281.1 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19281.1

wtgodbe · 2019-05-31T19:59:27Z

To cherry-pick:

#1222 - DONE

This reverts commit 4aa3cc2.

wtgodbe · 2019-05-31T20:26:32Z

/azp run

azure-pipelines · 2019-05-31T20:26:46Z

Azure Pipelines successfully started running 1 pipeline(s).

mmitche and others added 30 commits April 22, 2019 18:19

Update branding to preview6

406aec1

Merge pull request dotnet#1164 from mmitche/update-branding-on-master

9d1d009

Update branding on master

Prevent non-framework code from extending BaseNumberConverter

9681af4

This fixes dotnet#1171.

Update to the 3.0 SDK

2f11f62

Disable unnecessary import of BeforeCommonTargets.targets

ec5eb04

Remove unnecessary imports of dir.build.targets

0db86a9

Merge pull request dotnet#1173 from wtgodbe/30SDK

b169999

Update to the 3.0 SDK

Move WithCancellation/ConfigureAwait extension methods

ebeec50

Merge pull request dotnet#1181 from joperezr/TaskAsyncEnumerableExten…

b77bbe5

…sions Move WithCancellation/ConfigureAwait extension methods to TaskAsyncEnumerableExtensions

Merge pull request dotnet#1176 from terrajobst/base-number-converter-fix

904f4f5

Prevent non-framework code from extending BaseNumberConverter

Add bulk operations to Collection<T>

4aa3cc2

This fixes dotnet#1091.

Fix official build which is failing when trying to publish the packag…

c2a2878

…es to BAR (dotnet#1182) * Fix official build which is failing when trying to publish the packages to BAR * Fix parameter for publishing to BAR

Merge pull request dotnet#1175 from terrajobst/observable-bulk

a7b363d

Add bulk operations to Collection<T>

Adding signing to the build command as well

013b89d

This is required for official builds in order for them to successfully be pushed to the blob feeds.

Fail CI build if APICompat baseline files would change

f1d799b

Set BaselineAllAPICompatError based on ContinuousIntegrationBuild

efcc3ad

Update azure-pipelines.yml

df2760b

Update azure-pipelines.yml

ae68752

Merge pull request dotnet#1189 from dotnet/SwitchPool

557c5ec

Update azure-pipelines.yml

Merge pull request dotnet#1185 from wtgodbe/APICompatError

5f041c2

Fail CI build if APICompat baseline files would change

dotnet-maestro Bot and others added 14 commits May 22, 2019 13:15

Update dependencies from https://github.com/dotnet/corefx build 20190…

d564685

…521.9 (dotnet#1204) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19271.9 - System.Reflection.Emit - 4.6.0-preview6.19271.9 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19271.9

Update dependencies from https://github.com/dotnet/corefx build 20190…

f54fdb3

…522.8 (dotnet#1206) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19272.8 - System.Reflection.Emit - 4.6.0-preview6.19272.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19272.8

Update dependencies from https://github.com/dotnet/corefx build 20190…

dbf0273

…523.8 (dotnet#1208) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19273.8 - System.Reflection.Emit - 4.6.0-preview6.19273.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19273.8

Update dependencies from https://github.com/dotnet/corefx build 20190…

be14760

…524.8 (dotnet#1211) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19274.8 - System.Reflection.Emit - 4.6.0-preview6.19274.8 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19274.8

Update dependencies from https://github.com/dotnet/corefx build 20190…

abc624a

…527.2 (dotnet#1213) - System.Reflection.Emit.Lightweight - 4.6.0-preview6.19277.2 - System.Reflection.Emit - 4.6.0-preview6.19277.2 - System.Reflection.Emit.ILGeneration - 4.6.0-preview6.19277.2

dotnet-maestro-bot requested review from a team as code owners May 31, 2019 19:09

wtgodbe closed this May 31, 2019

wtgodbe reopened this May 31, 2019

wtgodbe closed this May 31, 2019

wtgodbe reopened this May 31, 2019

Revert "Add bulk operations to Collection<T>"

b2d56be

This reverts commit 4aa3cc2.

wtgodbe mentioned this pull request May 31, 2019

Revert "Add bulk operations to Collection<T>" #1222

Merged

wtgodbe merged commit 034dbc3 into dotnet:release/3.0 May 31, 2019

karelz added this to the .NET Standard 2.1 milestone Jul 17, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'master' => 'release/3.0'#1221

[automated] Merge branch 'master' => 'release/3.0'#1221
wtgodbe merged 62 commits intodotnet:release/3.0from
dotnet-maestro-bot:merge/master-to-release/3.0

dotnet-maestro-bot commented May 31, 2019

Uh oh!

wtgodbe commented May 31, 2019 •

edited

Loading

Uh oh!

wtgodbe commented May 31, 2019

Uh oh!

azure-pipelines Bot commented May 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

dotnet-maestro-bot commented May 31, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

wtgodbe commented May 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wtgodbe commented May 31, 2019

Uh oh!

azure-pipelines Bot commented May 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

wtgodbe commented May 31, 2019 •

edited

Loading