Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

[automated] Merge branch 'release/3.0' => 'release/3.1' #41079

Conversation

dotnet-maestro-bot
Copy link

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

This PR merges commits made on release/3.0 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.

merge button instructions

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.0
git pull --ff-only
git checkout release/3.1
git pull --ff-only
git merge --no-ff release/3.0

# 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/corefx HEAD:merge/release/3.0-to-release/3.1
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/corefx HEAD:merge/release/3.0-to-release/3.1

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.0-to-release/3.1'. 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.0-to-release/3.1 release/3.1
git pull https://github.com/dotnet-maestro-bot/corefx merge/release/3.0-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/corefx HEAD:merge/release/3.0-to-release/3.1
or if you are using SSH
git checkout -b merge/release/3.0-to-release/3.1 release/3.1
git pull git@github.com:dotnet-maestro-bot/corefx merge/release/3.0-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/corefx HEAD:merge/release/3.0-to-release/3.1

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.

mmitche and others added 27 commits September 6, 2019 16:38
SDL validation is too expensive to run on a per-build basis. Disable for now
* Update dependencies from https://github.com/dotnet/standard build 20190907.2

- NETStandard.Library - 2.1.0-prerelease.19457.2

* Update dependencies from https://github.com/dotnet/standard build 20190907.1

- NETStandard.Library - 2.1.0-prerelease.19457.1
* Update dependencies from https://github.com/dotnet/core-setup build 20190907.02

- Microsoft.NETCore.App - 3.0.0-rc2-19457-02
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19457-02
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19457-02

* Update dependencies from https://github.com/dotnet/arcade build 20190906.10

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19456.10
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19456.10
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19456.10
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19456.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19456.10
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19456.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19456.10
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19456.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19456.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19456.10

* Update dependencies from https://github.com/dotnet/standard build 20190907.5

- NETStandard.Library - 2.1.0-prerelease.19457.5
* Update dependencies from https://github.com/dotnet/core-setup build 20190907.15

- Microsoft.NETCore.App - 3.0.0-rc2-19457-15
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19457-15
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19457-15

* Update dependencies from https://github.com/dotnet/arcade build 20190907.1

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19457.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19457.1
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19457.1
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19457.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19457.1
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19457.1
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19457.1
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19457.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19457.1
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19457.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19457.1
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19457.1

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190908.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190908.1

* Update dependencies from https://github.com/dotnet/standard build 20190908.3

- NETStandard.Library - 2.1.0-prerelease.19458.3
* Update dependencies from https://github.com/dotnet/core-setup build 20190908.11

- Microsoft.NETCore.App - 3.0.0-rc2-19458-11
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19458-11
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19458-11

* Update dependencies from https://github.com/dotnet/arcade build 20190908.2

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19458.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19458.2
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19458.2
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19458.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19458.2
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19458.2
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19458.2
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19458.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19458.2
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19458.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19458.2
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19458.2

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190909.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190909.1

* Update dependencies from https://github.com/dotnet/standard build 20190909.3

- NETStandard.Library - 2.1.0-prerelease.19459.3
…0909.3 (dotnet#40956)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19459.3
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19459.3
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19459.3
* Update dependencies from https://github.com/dotnet/standard build 20190909.4

- NETStandard.Library - 2.1.0-prerelease.19459.4

* Update dependencies from https://github.com/dotnet/core-setup build 20190909.40

- Microsoft.NETCore.App - 3.0.0-rc2-19459-40
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19459-40
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19459-40

* Update dependencies from https://github.com/dotnet/arcade build 20190909.10

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19459.10
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19459.10
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19459.10
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19459.10
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19459.10
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19459.10
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19459.10
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19459.10
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19459.10
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19459.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19459.10

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190910.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190910.1
…0910.2 (dotnet#40984)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.2
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.2
…0910.4 (dotnet#41006)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.4
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.4
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.4
…otnet#40986)

* Update dependencies from https://github.com/dotnet/arcade build 20190910.3

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19460.3
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19460.3
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19460.3
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19460.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19460.3
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19460.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19460.3
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19460.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19460.3
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19460.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19460.3

* Update dependencies from https://github.com/dotnet/standard build 20190910.4

- NETStandard.Library - 2.1.0-prerelease.19460.4

* Update dependencies from https://github.com/dotnet/standard build 20190910.5

- NETStandard.Library - 2.1.0-prerelease.19460.5
…o UTF-8 while escaping in Utf8JsonWriter. (dotnet#40997)

* Avoid MemoryMarshal.Cast when transcoding from UTF-16 to UTF-8 while
escaping in Utf8JsonWriter.

* Fix a typo in spacing within the test.

* Guard against empty spans where an implementation of JavascriptEncoder
might not handle null ptrs correctly.

* Cleanup tests to avoid some duplication.

* Some more test clean up.
…0910.8 (dotnet#41011)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.8
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.8
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.8
…0910.11 (dotnet#41014)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19460.11
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19460.11
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19460.11
* Update dependencies from https://github.com/dotnet/core-setup build 20190910.02

- Microsoft.NETCore.App - 3.0.0-rc2-19460-02
- Microsoft.NETCore.DotNetHost - 3.0.0-rc2-19460-02
- Microsoft.NETCore.DotNetHostPolicy - 3.0.0-rc2-19460-02

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190911.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190911.1

* Update dependencies from https://github.com/dotnet/standard build 20190911.3

- NETStandard.Library - 2.1.0-prerelease.19461.3
…0911.3 (dotnet#41035)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19461.3
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19461.3
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19461.3
…0911.5 (dotnet#41045)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19461.5
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19461.5
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19461.5
Setting version suffix as non empty for building release package versions
* Update dependencies from https://github.com/dotnet/arcade build 20190911.7

- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19461.7
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19461.7
- Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19461.7
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19461.7
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19461.7
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19461.7
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19461.7
- Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19461.7
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19461.7
- Microsoft.DotNet.GenFacades - 1.0.0-beta.19461.7
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7
- Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19461.7

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20190912.1

- optimization.windows_nt-x64.IBC.CoreFx - 99.99.99-master-20190912.1

* Update dependencies from https://github.com/dotnet/standard build 20190912.2

- NETStandard.Library - 2.1.0-prerelease.19462.2

* Update dependencies from https://github.com/dotnet/standard build 20190912.4

- NETStandard.Library - 2.1.0-prerelease.19462.4
…0912.2 (dotnet#41062)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19462.2
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19462.2
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.2
…-822e-4c08-a170-be6ca6353ea3

[release/3.0] Update dependencies from dotnet/standard
@mmitche
Copy link
Member

mmitche commented Sep 13, 2019

@danmosemsft Can you check and make sure nothing in here is needed for 3.1 p1?

@dotnet-maestro-bot
Copy link
Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-release/3.1 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.

mmitche and others added 2 commits September 12, 2019 18:52
…0912.5 (dotnet#41081)

- Microsoft.NET.Sdk.IL - 3.0.0-rc2.19462.5
- Microsoft.NETCore.ILAsm - 3.0.0-rc2.19462.5
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5
@dotnet-maestro-bot
Copy link
Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-release/3.1 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.

@mmitche
Copy link
Member

mmitche commented Sep 13, 2019

@danmosemsft @stephentoub Is that MacOS failure interesting? Seems pretty deterministic,.

@ViktorHofer
Copy link
Member

I'm fine doing this in cases where I notice but whoever else sees such failures please follow the policy described here: https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/pull-request-policy.md

@ViktorHofer ViktorHofer merged commit 3cba68f into dotnet:release/3.1 Sep 13, 2019
@stephentoub stephentoub deleted the merge/release/3.0-to-release/3.1 branch September 13, 2019 18:07
@karelz karelz added this to the 3.1 milestone Dec 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.