Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/5.0.2xx' => 'master' #9300

Conversation

dotnet-maestro-bot
Copy link

I detected changes in the release/5.0.2xx 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/5.0.2xx by the following committers:

  • dotnet-maestro[bot]
  • janvorli

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/5.0.2xx
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0.2xx

# 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/core-sdk HEAD:merge/release/5.0.2xx-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/5.0.2xx-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/5.0.2xx-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/5.0.2xx-to-master master
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/5.0.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/5.0.2xx-to-master
or if you are using SSH
git checkout -b merge/release/5.0.2xx-to-master master
git pull [email protected]:dotnet-maestro-bot/core-sdk merge/release/5.0.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/5.0.2xx-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.

janvorli and others added 30 commits December 13, 2020 17:28
* Enable linux-musl-arm* builds in CI

* Revise recent build table

  Reorder platform table more naturally
  - Windows -> Linux -> Linux-musl -> RHEL -> macOS
  - x64 -> arm -> arm64

  Rename linux-musl -> linux-musl-x64
  Add linux-musl-arm* rows

* Generalize linux-musl-* code to include arm*

- Set /p:OSName='linux-musl'

* Fix linux-musl-arm crossgen logic

* Build linux-musl-arm on Ubuntu 18.04

* Add linux-musl-arm to .NET 5.0 RuntimePackRids
….2 (dotnet#9223)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20611.5 to 11.0.0-beta.20611.6 (parent: Microsoft.NET.Sdk)
….5 (dotnet#9224)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20611.6 to 11.0.0-beta.20613.3 (parent: Microsoft.NET.Sdk)
[release/5.0.2xx] Enable linux-musl-arm* builds in CI
….7 (dotnet#9225)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.9.0-preview.2.6979 to 5.9.0-preview.3.6981 (parent: Microsoft.NET.Sdk)
….12 (dotnet#9228)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20613.3 to 11.0.0-beta.20614.5 (parent: Microsoft.NET.Sdk)
….2 (dotnet#9231)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20611-06 to 16.9.0-preview-20615-01 (parent: Microsoft.NET.Sdk)
….7 (dotnet#9232)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20615-01 to 16.9.0-preview-20615-04 (parent: Microsoft.NET.Sdk)
….9 (dotnet#9233)

[release/5.0.2xx] Update dependencies from dotnet/sdk
….11 (dotnet#9234)

[release/5.0.2xx] Update dependencies from dotnet/sdk
….13 (dotnet#9236)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20614.5 to 11.0.0-beta.20615.7 (parent: Microsoft.NET.Sdk)
….4 (dotnet#9238)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20615-04 to 16.9.0-preview-20616-03 (parent: Microsoft.NET.Sdk)
….6 (dotnet#9239)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20615.7 to 11.0.0-beta.20616.5 (parent: Microsoft.NET.Sdk)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20616.5 to 11.0.0-beta.20616.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.9.0-preview-20616-03 to 16.9.0-preview-20617-01 (parent: Microsoft.NET.Sdk)
….4 (dotnet#9246)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20617-01 to 16.9.0-preview-20618-02 (parent: Microsoft.NET.Sdk)
….5 (dotnet#9248)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20618-02 to 16.9.0-preview-20618-03 (parent: Microsoft.NET.Sdk)
….4 (dotnet#9250)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-2.20608.6 to 3.9.0-3.20619.14 (parent: Microsoft.NET.Sdk)
….7 (dotnet#9252)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20618-03 to 16.9.0-preview-20621-02 (parent: Microsoft.NET.Sdk)
….7 (dotnet#9259)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20616.7 to 11.0.0-beta.20622.10 (parent: Microsoft.NET.Sdk)
….11 (dotnet#9262)

[release/5.0.2xx] Update dependencies from dotnet/sdk
….12 (dotnet#9263)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20622.10 to 11.0.0-beta.20623.4 (parent: Microsoft.NET.Sdk)
….13 (dotnet#9264)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20621-02 to 16.9.0-preview-20623-01 (parent: Microsoft.NET.Sdk)
….15 (dotnet#9266)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20623.4 to 11.0.0-beta.20623.5 (parent: Microsoft.NET.Sdk)
….2 (dotnet#9275)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20623.5 to 11.0.0-beta.20627.2 (parent: Microsoft.NET.Sdk)
….9 (dotnet#9289)

[release/5.0.2xx] Update dependencies from dotnet/sdk
….6 (dotnet#9295)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.9.0-preview.3.6981 to 5.9.0-preview.3.7002 (parent: Microsoft.NET.Sdk)
….7 (dotnet#9297)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20623-01 to 16.9.0-preview-20630-02 (parent: Microsoft.NET.Sdk)
….9 (dotnet#9299)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20627.2 to 11.0.0-beta.20630.3 (parent: Microsoft.NET.Sdk)
…230.2 (dotnet#9303)

[master] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20621-02 to 1.1.0-beta-20628-02 (parent: Microsoft.DotNet.Arcade.Sdk)
  - XliffTasks: from 1.0.0-beta.20622.1 to 1.0.0-beta.20629.1 (parent: Microsoft.DotNet.Arcade.Sdk)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.9.0-preview.3.6995 to 5.9.0-preview.3.7002 (parent: Microsoft.NET.Sdk)
dotnet-maestro bot and others added 10 commits December 31, 2020 19:03
….1 (dotnet#9302)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20630.3 to 11.0.0-beta.20630.5 (parent: Microsoft.NET.Sdk)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20629.3 to 6.0.0-alpha.1.20631.2 (parent: Microsoft.NET.Sdk)
….5 (dotnet#9306)

[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.20627.4 to 3.9.0-4.20630.10 (parent: Microsoft.NET.Sdk)
….6 (dotnet#9307)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20630.5 to 11.0.0-beta.20631.2 (parent: Microsoft.NET.Sdk)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20631.2 to 6.0.0-alpha.1.21051.2 (parent: Microsoft.NET.Sdk)
….2 (dotnet#9309)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.0.0-beta.20631.2 to 11.0.0-beta.21052.1 (parent: Microsoft.NET.Sdk)
….1 (dotnet#9310)

[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.21051.2 to 6.0.0-alpha.1.21052.6 (parent: Microsoft.NET.Sdk)
….3 (dotnet#9312)

[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.9.0-preview-20630-02 to 16.9.0-preview-21053-01 (parent: Microsoft.NET.Sdk)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.20630.10 to 3.9.0-4.20631.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.9.0-preview-20630-02 to 16.9.0-preview-21053-01 (parent: Microsoft.NET.Sdk)
Copy link
Member

@v-wuzhai v-wuzhai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same PR

@v-wuzhai v-wuzhai closed this Jan 4, 2021
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.

None yet

3 participants