[automated] Merge branch 'release/8.0.1xx' => 'main' #35432

dotnet-maestro-bot · 2023-09-15T09:50:49Z

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

v-wuzhai
dotnet-maestro[bot]
marcpopMSFT
marek-safar
dkurepa
jjonescz

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

# 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.1xx-to-main

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/sdk HEAD:merge/release/8.0.1xx-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.1xx-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.1xx-to-main main
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/8.0.1xx-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.1xx-to-main

or if you are using SSH

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

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.2

…815.7 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23409.1 -> To Version 8.0.100-beta.23415.7

…0230815.2 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-rc.1.23414.1 -> To Version 8.0.100-rc.1.23415.2

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.3

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.4

…net#34647)

…34646)

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.6

…d PublishAotUsingRuntimePack=true

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.8

…815.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.8.0-1.23415.8 -> To Version 4.8.0-1.23415.9

…815.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.8.0-1.23414.8 -> To Version 4.8.0-1.23415.10

…815.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.8.0-1.23415.10 -> To Version 4.8.0-1.23415.11

…34643)

…815.12 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.8.0-1.23415.11 -> To Version 4.8.0-1.23415.12

…815.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.8.0-1.23415.11 -> To Version 4.8.0-1.23415.13

…34664)

…0816.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-03

…6.8.0.65 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-preview.1.60 -> To Version 6.8.0-preview.1.65

…0816.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-04

Co-authored-by: Chet Husk <[email protected]> Co-authored-by: Rainer Sigwald <[email protected]>

The Mono.ToolChain.Current manifest added a publish target for wasm and mobile workloads that send telemetry events for the type of configuration and options being used. This change allows that event to be fully tracked.

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

…tnet#34677)

…0816.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-05

…otnet#34680)

…ld 20230915.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rc.2.23465.1 -> To Version 8.0.0-rc.2.23465.5

…915.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.8.0-3.23462.10 -> To Version 4.8.0-3.23465.4

…15.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 8.0.0-preview.23465.1 -> To Version 8.0.0-preview.23465.2

…0230915.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.23465.1 -> To Version 8.0.0-beta.23465.2

…0915.13 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.DotNetHostResolver , 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.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.2.23464.16 -> To Version 8.0.0-rc.2.23465.13

…915.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.8.0-3.23462.10 -> To Version 4.8.0-3.23465.5

…0230916.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.23465.1 -> To Version 8.0.0-beta.23466.1

…uild 20230916.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23464.2 -> To Version 3.11.0-beta1.23466.1

…35458) [release/8.0.1xx] Update dependencies from dotnet/aspnetcore

…uild 20230916.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23464.2 -> To Version 3.11.0-beta1.23466.2

…0230916.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.23465.1 -> To Version 8.0.0-beta.23466.2

…0916.4 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.DotNetHostResolver , 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.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rc.2.23464.16 -> To Version 8.0.0-rc.2.23466.4

…otnet#35469)

…35462)

…net#35456)

v-wuzhai · 2023-09-21T06:30:48Z

@JL03-Yue Could you help to review these changes?

v-wuzhai · 2023-09-28T05:35:28Z

@dotnet/domestic-cat would you be able to review these changes? Thanks!

vlada-shubina and others added 30 commits July 25, 2023 13:40

draft implementation of oauth

0b0b51e

Merge branch 'main' into containers-oauth

98933ba

minor refactor of HTTP GET and adding xmldoc for methods and members

2b3df7b

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

f18c889

…815.7 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23409.1 -> To Version 8.0.100-beta.23415.7

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

bd60bc8

…0230815.2 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-rc.1.23414.1 -> To Version 8.0.100-rc.1.23415.2

[release/8.0.1xx-rc1] Update dependencies from dotnet/templating (dot…

1f79edb

…net#34647)

[release/8.0.1xx-rc1] Update dependencies from dotnet/fsharp (dotnet#…

072a342

…34646)

Fix runtime pack selection for dotnet build with PublishAot=true an…

4f75050

…d PublishAotUsingRuntimePack=true

[release/8.0.1xx-rc1] Update dependencies from dotnet/roslyn (dotnet#…

64d425c

…34643)

[release/8.0.1xx-rc1] Update dependencies from dotnet/roslyn (dotnet#…

673a802

…34664)

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

73495a7

…0816.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-03

Containers: implementation of OAuth2 (dotnet#34237)

0034991

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

34a7bdb

…0816.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-04

MSBuild terminal logger enamblement. (dotnet#34606)

1bfb668

Co-authored-by: Chet Husk <[email protected]> Co-authored-by: Rainer Sigwald <[email protected]>

[release/8.0.1xx-rc1] Update dependencies from dotnet/arcade (dotnet#…

a6b179a

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

[release/8.0.1xx-rc1] Update dependencies from nuget/nuget.client (do…

8b51a8b

…tnet#34677)

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

265bd99

…0816.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23415-03 -> To Version 17.8.0-preview-23416-05

[release/8.0.1xx-rc1] Add WorkloadPublishProperties telemetry event (d…

4cccedf

…otnet#34680)

github-actions bot and others added 21 commits September 15, 2023 14:53

[release/8.0.1xx] Add workload (dotnet#35451)

214cf78

Merging internal commits for release/8.0.1xx (dotnet#35407)

2ba6f8b

Metrics switch support in the SDK (dotnet#35418)

1499729

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

f98235c

…35458) [release/8.0.1xx] Update dependencies from dotnet/aspnetcore

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

cc791b4

…otnet#35469)

[release/8.0.1xx] Update dependencies from dotnet/runtime (dotnet#35463)

beba98f

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

8dd5312

…35462)

[release/8.0.1xx] Update dependencies from dotnet/razor (dotnet#35460)

0128c94

[release/8.0.1xx] Update dependencies from dotnet/windowsdesktop (dot…

59d7626

…net#35456)

[release/8.0.1xx] Update dependencies from dotnet/roslyn (dotnet#35448)

2e53d10

v-wuzhai requested review from a team and andriipatsula as code owners September 18, 2023 02:57

Merge branch 'release/8.0.1xx'

c4e2d1e

v-wuzhai force-pushed the merge/release/8.0.1xx-to-main branch from ae74374 to c4e2d1e Compare September 18, 2023 03:00

v-wuzhai requested a review from a team September 19, 2023 02:06

Forgind approved these changes Oct 2, 2023

View reviewed changes

Forgind merged commit 8f3996c into dotnet:main Oct 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/8.0.1xx' => 'main' #35432

[automated] Merge branch 'release/8.0.1xx' => 'main' #35432

Uh oh!

dotnet-maestro-bot commented Sep 15, 2023

Uh oh!

v-wuzhai commented Sep 21, 2023

Uh oh!

v-wuzhai commented Sep 28, 2023

Uh oh!

Uh oh!

[automated] Merge branch 'release/8.0.1xx' => 'main' #35432

[automated] Merge branch 'release/8.0.1xx' => 'main' #35432

Uh oh!

Conversation

dotnet-maestro-bot commented Sep 15, 2023

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 Sep 21, 2023

Uh oh!

v-wuzhai commented Sep 28, 2023

Uh oh!

Uh oh!