[automated] Merge branch 'release/6.0.4xx' => 'main' by dotnet-maestro-bot · Pull Request #25522 · dotnet/sdk

dotnet-maestro-bot · 2022-05-19T08:37:28Z

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

v-wuzhai
dotnet-maestro[bot]
marcpopMSFT
gkulin
joeloff
dsplaisted

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

# 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/sdk HEAD:merge/release/6.0.4xx-to-main

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-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/6.0.4xx-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/6.0.4xx-to-main main
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/6.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-main

or if you are using SSH

git checkout -b merge/release/6.0.4xx-to-main main
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/6.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-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.

…date

…b.com/gkulin/sdk into featureBandFallbackWithWorkloadUpdate

…6.0.3xx

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

…0513.2 (dotnet#25410) [release/6.0.4xx] Update dependencies from dotnet/msbuild

…0516.1 Microsoft.Build.Localization , Microsoft.Build From Version 17.3.0-preview-22263-02 -> To Version 17.3.0-preview-22266-01

…6b01-13b0-4318-9f5c-fb943330ccef [release/6.0.4xx] Update dependencies from dotnet/msbuild

…0516.3 Microsoft.Build.Localization , Microsoft.Build From Version 17.3.0-preview-22266-01 -> To Version 17.3.0-preview-22266-03

…516.1 dotnet-format From Version 6.4.326301 -> To Version 6.4.326601

…516.2 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22264.3 -> To Version 4.3.0-2.22266.2

…516.2 dotnet-format From Version 6.4.326301 -> To Version 6.4.326602

…516.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 6.0.5-beta.22262.2 -> To Version 6.0.5-beta.22266.2

…0cf6-6c2b-46fc-8664-2c37ab79bb4c [release/6.0.4xx] Update dependencies from dotnet/roslyn

…9bf2-9dd6-437c-b7a5-ed4ccb540add [release/6.0.4xx] Update dependencies from dotnet/msbuild

…516.6 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-1.22266.6

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

…516.7 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22266.7

…rkloadUpdate Feature band fallback with workload update

…517.1 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22267.1

Enable the 4.8.1 target in sdk style projects

…517.2 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22267.2

…517.3 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22267.3

…517.4 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22267.4

…517.5 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22266.4 -> To Version 4.3.0-2.22267.5

…fe6c-7ce3-4f8a-9e5f-6ca423209703 [release/6.0.4xx] Update dependencies from dotnet/roslyn

…517.6 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22267.5 -> To Version 4.3.0-2.22267.6

…db21-f816-4275-bb88-a9b8ce1ffe74 [release/6.0.4xx] Update dependencies from dotnet/roslyn

…518.1 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22267.6 -> To Version 4.3.0-2.22268.1

…518.2 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22267.6 -> To Version 4.3.0-2.22268.2

…518.4 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22267.6 -> To Version 4.3.0-2.22268.4

…518.5 Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild From Version 4.3.0-2.22267.6 -> To Version 4.3.0-2.22268.5

…72bb-5401-4983-9b6d-7a0569d992c9 [release/6.0.4xx] Update dependencies from dotnet/roslyn

v-wuzhai · 2022-05-19T10:28:17Z

@gkulin @joeloff @marcpopMSFT Could you help to confirm if we need to merge these changes?

gkulin · 2022-05-23T15:51:55Z

Yes, the changes from me need to be merged. I'm not sure about the changes from Marc and Jacques.

joeloff · 2022-05-23T16:17:37Z

Yes, these changes all need to flow to main

gkulin and others added 30 commits March 30, 2022 15:44

address todos and comments from fallback with rollback bugs

9b6ba1c

update and abstract fallback logic

375967f

finish up fallback changes

f5cba6d

beginning to write tests

ad730aa

update advertised test

03ebbb5

add test for calculating updates given advertised manifests

83917b4

adding comments for what kinds of additional tests to add

d8a2d3e

Add test case for manifest update fallback

295430c

add tests

881e852

update fallback with no updates test

6d93c02

update tests

0051dc9

update tests for online versus offline manifest package update

4fbcbd2

Update Microsoft.NET.SupportedTargetFrameworks.props

d8b19b0

Modify tests for 481

0990e9f

add passing online versus offline tests and clean up comments

ae56c9c

Merge branch 'release/6.0.4xx' into featureBandFallbackWithWorkloadUp…

3244d1b

…date

Include all defines

eb3ccb4

fix typo

a652775

Merge branch 'featureBandFallbackWithWorkloadUpdate' of https://githu…

8b5a5e4

…b.com/gkulin/sdk into featureBandFallbackWithWorkloadUpdate

Remove transitive dependencies for System.Private.Uri (dotnet#25420)

2dc357d

Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/…

d2596e4

…6.0.3xx

Merge pull request dotnet#25434 from dotnet-maestro-bot/merge/release…

cb27e28

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

Update dependencies from https://github.com/dotnet/msbuild build 2022…

b0cb8ac

…0513.2 (dotnet#25410) [release/6.0.4xx] Update dependencies from dotnet/msbuild

Update dependencies from https://github.com/dotnet/msbuild build 2022…

b722e9e

…0516.1 Microsoft.Build.Localization , Microsoft.Build From Version 17.3.0-preview-22263-02 -> To Version 17.3.0-preview-22266-01

Merge pull request dotnet#25448 from dotnet/darc-release/6.0.4xx-d95d…

1359e96

…6b01-13b0-4318-9f5c-fb943330ccef [release/6.0.4xx] Update dependencies from dotnet/msbuild

Update dependencies from https://github.com/dotnet/msbuild build 2022…

1086ed5

…0516.3 Microsoft.Build.Localization , Microsoft.Build From Version 17.3.0-preview-22266-01 -> To Version 17.3.0-preview-22266-03

Update dependencies from https://github.com/dotnet/format build 20220…

d0e0b1d

…516.1 dotnet-format From Version 6.4.326301 -> To Version 6.4.326601

Update dependencies from https://github.com/dotnet/format build 20220…

7f6e8f7

…516.2 dotnet-format From Version 6.4.326301 -> To Version 6.4.326602

Update dependencies from https://github.com/dotnet/fsharp build 20220…

cd51a22

…516.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 6.0.5-beta.22262.2 -> To Version 6.0.5-beta.22266.2

v-wuzhai and others added 21 commits May 16, 2022 19:12

Merge pull request dotnet#25462 from dotnet/darc-release/6.0.4xx-02ec…

20c6e85

…0cf6-6c2b-46fc-8664-2c37ab79bb4c [release/6.0.4xx] Update dependencies from dotnet/roslyn

Merge pull request dotnet#25456 from dotnet/darc-release/6.0.4xx-6e0c…

348ca65

…9bf2-9dd6-437c-b7a5-ed4ccb540add [release/6.0.4xx] Update dependencies from dotnet/msbuild

Merge pull request dotnet#25467 from dotnet-maestro-bot/merge/release…

b0c27fa

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

apply Daniel's suggestion

53c0511

Merge pull request dotnet#24678 from gkulin/featureBandFallbackWithWo…

cfca449

…rkloadUpdate Feature band fallback with workload update

Merge pull request dotnet#25393 from dotnet/marcpopMSFT-add481target

11ddd40

Enable the 4.8.1 target in sdk style projects

Merge pull request dotnet#25475 from dotnet/darc-release/6.0.4xx-766f…

1bbb77d

…fe6c-7ce3-4f8a-9e5f-6ca423209703 [release/6.0.4xx] Update dependencies from dotnet/roslyn

Merge pull request dotnet#25497 from dotnet/darc-release/6.0.4xx-0e6a…

8451fe3

…db21-f816-4275-bb88-a9b8ce1ffe74 [release/6.0.4xx] Update dependencies from dotnet/roslyn

Merge pull request dotnet#25513 from dotnet/darc-release/6.0.4xx-7f32…

384cb3c

…72bb-5401-4983-9b6d-7a0569d992c9 [release/6.0.4xx] Update dependencies from dotnet/roslyn

dotnet-maestro-bot force-pushed the merge/release/6.0.4xx-to-main branch from 8c814a6 to 384cb3c Compare May 19, 2022 08:37

ghost added the Area-Infrastructure label May 19, 2022

Merge branch 'release/6.0.4xx' into main

f7a7dfe

v-wuzhai force-pushed the merge/release/6.0.4xx-to-main branch from c51e4af to f7a7dfe Compare May 19, 2022 10:27

marcpopMSFT requested a review from joeloff May 20, 2022 19:05

marcpopMSFT merged commit ee0504f into dotnet:main May 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/6.0.4xx' => 'main'#25522

[automated] Merge branch 'release/6.0.4xx' => 'main'#25522
marcpopMSFT merged 60 commits into
dotnet:mainfrom
dotnet-maestro-bot:merge/release/6.0.4xx-to-main

dotnet-maestro-bot commented May 19, 2022

Uh oh!

v-wuzhai commented May 19, 2022

Uh oh!

gkulin commented May 23, 2022

Uh oh!

joeloff commented May 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

dotnet-maestro-bot commented May 19, 2022

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

v-wuzhai commented May 19, 2022

Uh oh!

gkulin commented May 23, 2022

Uh oh!

joeloff commented May 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants