[automated] Merge branch 'release/7.0.4xx' => 'main' #32009

dotnet-maestro-bot · 2023-04-24T20:51:09Z

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

dotnet-maestro[bot]
v-wuzhai
marcpopMSFT
rainersigwald
joeloff

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

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/7.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/7.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/7.0.4xx-to-main main
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/7.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/7.0.4xx-to-main

or if you are using SSH

git checkout -b merge/release/7.0.4xx-to-main main
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/7.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/7.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.

…420.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23219.11 -> To Version 4.7.0-1.23220.1

…420.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23219.11 -> To Version 4.7.0-1.23220.2

…420.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.2 -> To Version 4.7.0-1.23220.3

…420.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.3 -> To Version 4.7.0-1.23220.4

[release/7.0.4xx] Update dependencies from dotnet/razor

…420.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.4 -> To Version 4.7.0-1.23220.5

…0421.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23217-02 -> To Version 17.7.0-preview-23221-01

…0421.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23217-02 -> To Version 17.7.0-preview-23221-02

…230420.1 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23214.2 -> To Version 17.7.0-preview.23220.1

…1928)

…421.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.1

…421.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.400-beta.23219.3 -> To Version 7.0.400-beta.23221.1

…421.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.2

…6.7.0.17 NuGet.Build.Tasks From Version 6.7.0-preview.1.16 -> To Version 6.7.0-preview.1.17

…421.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.3

…421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23221.2

…421.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.4

…otnet#31598)" This reverts commit d2e470b, reversing changes made to 377caa7. Follows the MSBuild revert in dotnet/msbuild#8571.

…421.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.5

…421.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.7

…421.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.8

…421.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23221.8 -> To Version 4.7.0-1.23221.10

…421.13 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.13

…421.14 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23221.14

…422.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23222.1

…6.7.0.18 NuGet.Build.Tasks From Version 6.7.0-preview.1.16 -> To Version 6.7.0-preview.1.18

…0423.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23223-05 -> To Version 17.7.0-preview-23223-06

…6.7.0.19 NuGet.Build.Tasks From Version 6.7.0-preview.1.18 -> To Version 6.7.0-preview.1.19

…0424.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23221-02 -> To Version 17.7.0-preview-23224-01

…#31978)

…0424.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-05

…0424.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-06

…0424.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-09

…230424.1 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.1

…230424.3 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.3

…230424.2 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.2

[release/7.0.4xx] Update dependencies from dotnet/razor

…1999)

…24.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23224.3 -> To Version 7.0.0-preview.23224.4

…2001)

v-wuzhai · 2023-04-25T10:02:47Z

Looks like it is the same as the change in #31983, so choose one to merge.

dotnet-maestro bot and others added 30 commits April 20, 2023 19:17

[release/7.0.4xx] Update dependencies from dotnet/razor (dotnet#31902)

209fea9

[release/7.0.4xx] Update dependencies from dotnet/razor

[release/7.0.4xx] Update dependencies from dotnet/roslyn (dotnet#31915)

63acc09

[release/7.0.4xx] Update dependencies from dotnet/roslyn (dotnet#31923)

f53e9a9

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

9843b60

…0421.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23217-02 -> To Version 17.7.0-preview-23221-01

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

b630ea9

…0421.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23217-02 -> To Version 17.7.0-preview-23221-02

Update dependencies from https://github.com/microsoft/vstest build 20…

ae6a610

…230420.1 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23214.2 -> To Version 17.7.0-preview.23220.1

[release/7.0.4xx] Update dependencies from microsoft/vstest (dotnet#3…

3aebe9f

…1928)

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

56b3ce0

…421.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.400-beta.23219.3 -> To Version 7.0.400-beta.23221.1

Update dependencies from https://github.com/nuget/nuget.client build …

e0b4e19

…6.7.0.17 NuGet.Build.Tasks From Version 6.7.0-preview.1.16 -> To Version 6.7.0-preview.1.17

[release/7.0.4xx] Update dependencies from dotnet/fsharp (dotnet#31935)

cf8c22e

Update dependencies from https://github.com/dotnet/arcade build 20230…

4034c0b

…421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23221.2

Revert "Respond to ProduceReferenceAssembly default changing to true (d…

a84060a

…otnet#31598)" This reverts commit d2e470b, reversing changes made to 377caa7. Follows the MSBuild revert in dotnet/msbuild#8571.

[release/7.0.4xx] Update dependencies from dotnet/msbuild (dotnet#31927)

162443b

Update dependencies from https://github.com/nuget/nuget.client build …

0cce763

…6.7.0.18 NuGet.Build.Tasks From Version 6.7.0-preview.1.16 -> To Version 6.7.0-preview.1.18

dotnet-maestro bot and others added 13 commits April 23, 2023 08:42

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

9b76c84

…0423.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23223-05 -> To Version 17.7.0-preview-23223-06

Update dependencies from https://github.com/nuget/nuget.client build …

7c67dd7

…6.7.0.19 NuGet.Build.Tasks From Version 6.7.0-preview.1.18 -> To Version 6.7.0-preview.1.19

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

db70b9c

…0424.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23221-02 -> To Version 17.7.0-preview-23224-01

[release/7.0.4xx] Update dependencies from nuget/nuget.client (dotnet…

40b257f

…#31978)

[release/7.0.4xx] Update dependencies from dotnet/msbuild (dotnet#31967)

8988790

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

8cc9e75

…0424.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-05

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

ad735a4

…0424.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-06

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

a3fbd48

…0424.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.7.0-preview-23224-01 -> To Version 17.7.0-preview-23224-09

Adding support for additional auth scenarios for Zip Deploy

a603f14

Update dependencies from https://github.com/microsoft/vstest build 20…

2e3ddfc

…230424.1 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.1

Update dependencies from https://github.com/microsoft/vstest build 20…

c616eef

…230424.3 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.3

Update dependencies from https://github.com/microsoft/vstest build 20…

b59ffae

…230424.2 Microsoft.NET.Test.Sdk From Version 17.7.0-preview.23220.1 -> To Version 17.7.0-preview.23224.2

[release/7.0.4xx] Update dependencies from dotnet/razor (dotnet#32007)

0ee4bd4

[release/7.0.4xx] Update dependencies from dotnet/razor

dotnet-maestro-bot force-pushed the merge/release/7.0.4xx-to-main branch from d04632b to 0ee4bd4 Compare April 24, 2023 20:51

dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Apr 24, 2023

Adding support for additional auth scenarios for Zip Deploy (dotnet#3…

05cbe1c

…1999)

dotnet-maestro-bot requested a review from vijayrkn as a code owner April 24, 2023 21:31

dotnet-maestro bot and others added 4 commits April 24, 2023 21:48

[release/7.0.4xx] Update dependencies from dotnet/razor (dotnet#32010)

f29c124

[release/7.0.4xx] Update dependencies from dotnet/msbuild (dotnet#31991)

519c704

[release/7.0.4xx] Update dependencies from microsoft/vstest (dotnet#3…

ed81d2c

…2001)

v-wuzhai requested a review from a team as a code owner April 25, 2023 06:07

Merge branch 'release/7.0.4xx'

e02c7c8

v-wuzhai force-pushed the merge/release/7.0.4xx-to-main branch from f8c2213 to e02c7c8 Compare April 25, 2023 06:09

v-wuzhai requested a review from marcpopMSFT April 25, 2023 06:13

marcpopMSFT approved these changes Apr 26, 2023

View reviewed changes

marcpopMSFT merged commit 1fd7ce3 into dotnet:main Apr 26, 2023

marcpopMSFT mentioned this pull request May 3, 2023

Adding support for additional auth scenarios for Zip Deploy #31983

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/7.0.4xx' => 'main' #32009

[automated] Merge branch 'release/7.0.4xx' => 'main' #32009

dotnet-maestro-bot commented Apr 24, 2023

v-wuzhai commented Apr 25, 2023

[automated] Merge branch 'release/7.0.4xx' => 'main' #32009

[automated] Merge branch 'release/7.0.4xx' => 'main' #32009

Conversation

dotnet-maestro-bot commented Apr 24, 2023

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

v-wuzhai commented Apr 25, 2023