Skip to content

[automated] Merge branch 'release/5.0.3xx' => 'main' #10581

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 45 commits into from
Closed

[automated] Merge branch 'release/5.0.3xx' => 'main' #10581

wants to merge 45 commits into from

Conversation

dotnet-maestro-bot
Copy link

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

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

  • dotnet-maestro[bot]
  • marcpopMSFT

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.3xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/5.0.3xx

# 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.3xx-to-main
or if you are using SSH 
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/5.0.3xx-to-main

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

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.

dotnet-maestro bot and others added 30 commits April 20, 2021 05:50
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210419…
3f92315 
….10 (dotnet#10254)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21214.1 to 11.4.2-beta.21218.2 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210420…
02c63f3 
….12 (dotnet#10266)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21205-05 to 16.10.0-preview-21215-05 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210420…
58aa3bf 
….25 (dotnet#10270)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.9.0-6.21160.10 to 3.10.0-3.21216.10 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210421…
df126f6 
….8 (dotnet#10275)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21218.2 to 11.4.2-beta.21220.2 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210421…
9777bfd 
….25 (dotnet#10281)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210421…
9d535e0 
….34 (dotnet#10287)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.9.1-release-20210308-01 to 16.10.0-release-20210420-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210422…
a8bc2ff 
….8 (dotnet#10292)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210422…
dad43e4 
….12 (dotnet#10295)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210422…
67b06e8 
….17 (dotnet#10299)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21220.2 to 11.4.2-beta.21221.4 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210422…
bc70607 
….21 (dotnet#10303)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210420-01 to 16.10.0-release-20210422-02 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10311)
5491c9e 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21215-05 to 16.10.0-preview-21222-12 (parent: Microsoft.NET.Sdk)
@marcpopMSFT
Update sdl-tsa-vars.config
b03194f
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210423…
347d644 
….10 (dotnet#10317)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21216.10 to 3.10.0-3.21222.20 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10319)
50ca602 
[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210424…
d464fd0 
….4 (dotnet#10330)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21221.4 to 11.4.2-beta.21223.3 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210425…
52ed897 
….10 (dotnet#10338)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21223.3 to 11.4.2-beta.21224.1 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210425…
16faa5d 
….12 (dotnet#10342)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21222.20 to 3.10.0-3.21223.23 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21222-12 to 16.10.0-preview-21223-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210427…
80e1ce6 
….3 (dotnet#10366)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21223-01 to 16.10.0-preview-21227-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210427…
3b8864e 
….14 (dotnet#10376)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210422-02 to 16.10.0-release-20210427-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21223.23 to 4.0.0-2.21227.16 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210427…
617b163 
….20 (dotnet#10382)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.10.0-preview.2.7203 to 5.10.0-preview.3.7228 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210428…
da8de01 
….13 (dotnet#10394)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210428…
cc8452c 
….16 (dotnet#10397)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10402)
404ef0e 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21224.1 to 11.4.2-beta.21227.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21227-01 to 16.10.0-preview-21228-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210429…
88e2bbc 
….2 (dotnet#10404)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21227.16 to 4.0.0-2.21227.22 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210429…
5d7729e 
….8 (dotnet#10412)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21228-01 to 16.10.0-preview-21228-02 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210429…
db001f3 
….19 (dotnet#10420)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210427-02 to 16.10.0-release-20210429-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21227.22 to 4.0.0-2.21229.16 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210429…
a350448 
….26 (dotnet#10425)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10432)
050a3e7 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21227.5 to 11.4.2-beta.21230.7 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210503…
bf3fac5 
….8 (dotnet#10464)

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10478)
5729ae8 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21230.7 to 11.4.2-beta.21253.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.16 to 4.0.0-2.21254.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21228-02 to 16.10.0-preview-21253-02 (parent: Microsoft.NET.Sdk)
dotnet-maestro bot and others added 15 commits May 4, 2021 21:32
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210504…
6a4d140 
….12 (dotnet#10501)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210429-01 to 16.10.0-release-20210504-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.10.0-preview.3.7228 to 5.10.0-rc.7240 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210505…
5c63576 
….2 (dotnet#10513)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21214.2 to 5.0.300-preview.21230.1 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10518)
94f1383 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210504-02 to 16.10.0-release-20210505-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21254.8 to 4.0.0-2.21254.26 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21253-02 to 16.11.0-preview-21254-21 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210506…
9dc2d38 
….10 (dotnet#10535)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21230.1 to 5.0.300-preview.21256.2 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210506.16
530a266 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.300-preview.21256.10 -> To Version 5.0.300-preview.21256.16

Dependency coherency updates

Microsoft.Build
 From Version 16.11.0-preview-21254-21 -> To Version 16.10.0-preview-21256-02 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210507.4
add921b 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.300-preview.21256.10 -> To Version 5.0.300-preview.21257.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-2.21254.26 -> To Version 4.0.0-2.21256.25 (parent: Microsoft.NET.Sdk
@marcpopMSFT
Merge pull request dotnet#10542 from dotnet/darc-release/5.0.3xx-cb6c…
15d71de 
…4acd-ee8e-45f6-b622-6c09429a1c06

[release/5.0.3xx] Update dependencies from dotnet/sdk
@dotnet-maestro
[release/5.0.3xx] Update dependencies from dotnet/sdk (dotnet#10556)
b216e38 
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21256.2 to 5.0.300-preview.21257.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210505-01 to 16.10.0-release-20210507-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210508…
42789e1 
….3 (dotnet#10564)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21256-02 to 16.10.0-preview-21257-01 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210508…
e659912 
….4 (dotnet#10565)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21256.25 to 4.0.0-2.21258.12 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210510…
fc11ed4 
….6 (dotnet#10575)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21257.1 to 5.0.300-preview.21260.2 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210511…
ced9b4d 
….5 (dotnet#10580)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21257-01 to 16.10.0-preview-21260-01 (parent: Microsoft.NET.Sdk)
@wtgodbe
Update aspnet 2.1/3.1 template version (dotnet#10486)
2b29192
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20210511…
4ff2792 
….20 (dotnet#10587)

[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210507-01 to 16.10.0-release-20210511-04 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21258.12 to 4.0.0-2.21260.14 (parent: Microsoft.NET.Sdk)
Merge branch 'release/5.0.3xx' into main
77ccb76
@v-wuzhai v-wuzhai force-pushed the merge/release/5.0.3xx-to-main branch from b11312a to 77ccb76 Compare May 12, 2021 03:14
v-wuzhai
v-wuzhai suggested changes May 12, 2021
View reviewed changes
Copy link

@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.

All changes are in eng/folder, so close this PR.

@v-wuzhai v-wuzhai closed this May 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@v-wuzhai v-wuzhai v-wuzhai requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dotnet-maestro-bot @v-wuzhai @marcpopMSFT @wtgodbe