[automated] Merge branch 'release/8.0.2xx' => 'main' #36078

dotnet-maestro-bot · 2023-10-12T17:39:09Z

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

dotnet-maestro[bot]
v-wuzhai

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/8.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.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/sdk HEAD:merge/release/8.0.2xx-to-main

or if you are using SSH

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

or if you are using SSH

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

…22.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23471.1 -> To Version 7.0.0-preview.23472.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23470.1 -> To Version 8.0.0-rtm.23469.3 (parent: Microsoft.NETCore.App.Runtime.win-x64

[release/8.0.1xx] Update dependencies from dotnet/runtime - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23470.1 to 8.0.0-rtm.23470.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)

…6.8.0.117 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-rc.112 -> To Version 6.8.0-rc.117

…ence-packages build 20230921.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23469.1 -> To Version 8.0.0-alpha.1.23471.1

…0230923.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23469.2 -> To Version 8.0.0-beta.23473.1

…23.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23471.1 -> To Version 7.0.0-preview.23473.1

…35688)

…#35682)

…0230923.2 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23473.1 -> To Version 8.0.0-beta.23473.2

…ence-packages build 20230921.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23469.1 -> To Version 8.0.0-alpha.1.23471.1

…0230924.1 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23471.8 -> To Version 8.0.0-rtm.23474.1

…uild 20230922.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23468.1 -> To Version 3.11.0-beta1.23472.1

…35690)

…darc-release/8.0.1xx-75496bf1-e29b-46fe-aa96-85ae1b3f8199

…0230924.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23471.4 -> To Version 8.0.100-rtm.23474.2

…darc-release/8.0.1xx-dc85a29c-8d30-4920-a83a-f1baeada18d6

…darc-release/8.0.1xx-97bafe0f-b744-4f15-84d4-0e87b2819a81

…darc-release/8.0.1xx-b9834071-8de8-4768-bbcb-67d1809fb943

…darc-release/8.0.1xx-30dbcbac-b242-40f8-add3-291a095497fc

…darc-release/8.0.1xx-1b6a8fb7-9f74-4a1b-bc97-965cc821fc9b

…nce-packages (dotnet#35654)

…otnet#35657)

…35660)

…012.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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.3

…012.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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.4

…012.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.9.0-1.23512.4 -> To Version 4.9.0-1.23512.5

[main] Update dependencies from nuget/nuget.client - Update minimum MSBuild version

[main] Update dependencies from dotnet/razor - Fix xUnit warnings - Use renamed Razor compiler DLLs (cherry picked from commit a36f703)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…012.6 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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.6

…012.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.9.0-1.23512.6 -> To Version 4.9.0-1.23512.7

…012.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.9.0-1.23512.7 -> To Version 4.9.0-1.23512.8

…012.9 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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.9

…1012.7 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 From Version 9.0.0-alpha.1.23512.4 -> To Version 9.0.0-alpha.1.23512.7

[main] Update dependencies from dotnet/fsharp

[main] Update dependencies from dotnet/msbuild

[release/8.0.2xx] Update dependencies from dotnet/fsharp

[release/8.0.2xx] Update dependencies from dotnet/roslyn

…012.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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.10

…012.11 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.9.0-1.23511.8 -> To Version 4.9.0-1.23512.11

…36054)

…#36050)

dotnet-maestro bot and others added 30 commits September 22, 2023 23:46

Update dependencies from https://github.com/dotnet/source-build-refer…

a773760

…ence-packages build 20230921.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23469.1 -> To Version 8.0.0-alpha.1.23471.1

[release/8.0.1xx] Update dependencies from dotnet/sourcelink (dotnet#…

a3f09f4

…35688)

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

ada69cc

…#35682)

Update dependencies from https://github.com/dotnet/source-build-refer…

87caec2

…ence-packages build 20230921.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23469.1 -> To Version 8.0.0-alpha.1.23471.1

[release/8.0.1xx] Update dependencies from dotnet/aspnetcore (dotnet#…

6e47ed4

…35690)

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

a15f179

…darc-release/8.0.1xx-75496bf1-e29b-46fe-aa96-85ae1b3f8199

Fix the errors

63b1e1a

Update dependencies from https://github.com/dotnet/templating build 2…

2e103a4

…0230924.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23471.4 -> To Version 8.0.100-rtm.23474.2

[release/8.0.1xx] Update dependencies from dotnet/fsharp (dotnet#35650)

08e5646

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

e27d2e4

…darc-release/8.0.1xx-dc85a29c-8d30-4920-a83a-f1baeada18d6

Fix the errors

0648890

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

75f2054

…darc-release/8.0.1xx-97bafe0f-b744-4f15-84d4-0e87b2819a81

Fix the errors

464eccd

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

c91db54

…darc-release/8.0.1xx-b9834071-8de8-4768-bbcb-67d1809fb943

Fix the errors

6616611

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

b31051a

…darc-release/8.0.1xx-30dbcbac-b242-40f8-add3-291a095497fc

Fix the errors

2bcd2d9

Fix the errors

0a44224

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …

34af016

…darc-release/8.0.1xx-1b6a8fb7-9f74-4a1b-bc97-965cc821fc9b

[release/8.0.1xx] Update dependencies from dotnet/source-build-refere…

6c6b7d9

…nce-packages (dotnet#35654)

[release/8.0.1xx] Update dependencies from dotnet/roslyn-analyzers (d…

dc5453b

…otnet#35657)

[release/8.0.1xx] Update dependencies from dotnet/templating (dotnet#…

50e01af

…35660)

dotnet-maestro-bot requested a review from a team as a code owner October 12, 2023 18:40

dotnet-maestro bot and others added 26 commits October 12, 2023 18:44

Workload manifest updater cleanup (dotnet#35859)

1e6e115

[main] Update dependencies from nuget/nuget.client (dotnet#36063)

fdb372b

[main] Update dependencies from nuget/nuget.client - Update minimum MSBuild version

Update minimum MSBuild version

3488bf1

[main] Update dependencies from dotnet/razor (dotnet#36041)

fc49a0d

[main] Update dependencies from dotnet/razor - Fix xUnit warnings - Use renamed Razor compiler DLLs (cherry picked from commit a36f703)

[main] Update dependencies from dotnet/runtime (dotnet#36080)

9a40ab8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

[main] Update dependencies from dotnet/fsharp (dotnet#36049)

341737b

[main] Update dependencies from dotnet/fsharp

[main] Update dependencies from dotnet/msbuild (dotnet#36048)

72b85d1

[main] Update dependencies from dotnet/msbuild

[release/8.0.2xx] Update dependencies from dotnet/fsharp (dotnet#36055)

235d8a9

[release/8.0.2xx] Update dependencies from dotnet/fsharp

[release/8.0.2xx] Update dependencies from dotnet/roslyn (dotnet#36056)

4816caa

[release/8.0.2xx] Update dependencies from dotnet/roslyn

[main] Update dependencies from dotnet/runtime (dotnet#36091)

852fddf

[release/8.0.2xx] Update dependencies from dotnet/razor (dotnet#36059)

ef0953d

[release/8.0.2xx] Update dependencies from dotnet/aspnetcore (dotnet#…

7f8a84e

…36054)

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

229d530

…#36050)

[main] Update dependencies from dotnet/roslyn (dotnet#36076)

cb11453

Merge branch 'release/8.0.2xx'

f583284

Fixed various branch merge issues. This should unmangle the build now.

ee6d0b3

MiYanni approved these changes Oct 16, 2023

View reviewed changes

MiYanni merged commit 748c716 into dotnet:main Oct 16, 2023

amcasey mentioned this pull request Oct 24, 2023

Update SDK to 23523.1 dotnet/aspnetcore#51588

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/8.0.2xx' => 'main' #36078

[automated] Merge branch 'release/8.0.2xx' => 'main' #36078

Uh oh!

dotnet-maestro-bot commented Oct 12, 2023

Uh oh!

Uh oh!

[automated] Merge branch 'release/8.0.2xx' => 'main' #36078

[automated] Merge branch 'release/8.0.2xx' => 'main' #36078

Uh oh!

Conversation

dotnet-maestro-bot commented Oct 12, 2023

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

Uh oh!