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

dotnet-maestro-bot · 2023-08-29T03:43:50Z

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:

dsplaisted
v-wuzhai
dotnet-maestro[bot]
marcpopMSFT
github-actions[bot]
invalid-email-address

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.

…pported dropdown list.

…in the CPM PR

…T-TFMsupport

…0230824.13 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-rc.2.23424.11 -> To Version 8.0.0-rc.2.23424.13

…0825.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23425-03

…34926)

…0230825.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.23422.2 -> To Version 8.0.0-beta.23425.1

…T-TFMsupport

…ng 8.0 and so require 17.8

…0230825.6 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-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.6

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

…#34938) [release/8.0.1xx] Update dependencies from nuget/nuget.client

…nce-packages (dotnet#34932) [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Co-authored-by: Mackinnon Buck <[email protected]>

…0230825.8 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-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.8

…825.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.8.0-2.23424.9 -> To Version 4.8.0-2.23425.1

…uild 20230825.3 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23424.2 -> To Version 3.11.0-beta1.23425.3

…0230825.11 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-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.11

…0230825.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.23422.2 -> To Version 8.0.0-beta.23425.2

…825.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-2.23424.9 -> To Version 4.8.0-2.23425.2

…825.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-2.23424.9 -> To Version 4.8.0-2.23425.3

…825.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23422.1 -> To Version 8.0.0-beta.23425.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23418.1 -> To Version 1.0.0-beta.23423.1 (parent: Microsoft.DotNet.Arcade.Sdk

…828.6 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23425.10 -> To Version 8.0.100-beta.23428.6

…230828.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23428-02

…0828.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-07

…0828.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-08

…0828.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-09

…0230828.8 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-rc.2.23425.11 -> To Version 8.0.0-rc.2.23428.8

…0230828.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.23425.2 -> To Version 8.0.0-beta.23428.2

…0230828.11 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-rc.2.23425.11 -> To Version 8.0.0-rc.2.23428.11

…als (dotnet#34976)

…4969)

…0829.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-09 -> To Version 17.8.0-preview-23429-01

…t file (dotnet#34943)

…0829.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-09 -> To Version 17.8.0-preview-23429-02

…0230828.15 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-rc.2.23425.11 -> To Version 8.0.0-rc.2.23428.15

…34974)

…34984)

marcpopMSFT and others added 30 commits August 11, 2023 14:07

Add error when targeting net8.0 in 17.7 and remove net8.0 from the su…

8bcc628

…pported dropdown list.

Merge remote-tracking branch 'origin/main' into marcpopMSFT-TFMsupport

e5603a0

Add back the current version of MSBuild that got removed by accident …

953bfc8

…in the CPM PR

Merge branch 'release/8.0.1xx' into marcpopMSFT-TFMsupport

5724b3d

Merge remote-tracking branch 'origin/release/8.0.1xx' into marcpopMSF…

325339a

…T-TFMsupport

Merge branch 'release/8.0.1xx' into marcpopMSFT-TFMsupport

c80dc1b

Merge branch 'release/8.0.1xx' into marcpopMSFT-TFMsupport

8feb5ff

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

1ba009c

…0825.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23425-03

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

9d77afa

…34926)

[release/8.0.1xx] Update dependencies from dotnet/msbuild (dotnet#34927)

54b8906

Merge remote-tracking branch 'origin/release/8.0.1xx' into marcpopMSF…

69cd62c

…T-TFMsupport

Get the current msbuild working with transitive pinning

0d544d3

Skip all the tests failing on the full framework leg that are targeti…

fcbf829

…ng 8.0 and so require 17.8

Enable Windows thread pool config switch via Project file

a0fcaed

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

b5f70b0

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

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

b102b17

…#34938) [release/8.0.1xx] Update dependencies from nuget/nuget.client

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

86bd0d0

…nce-packages (dotnet#34932) [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

[release/8.0.1xx] [Blazor] Remove hot reload deltas cache (dotnet#34940)

e0631d5

Co-authored-by: Mackinnon Buck <[email protected]>

Update our TFM support and error messaging for 17.7 (dotnet#34585)

10c63ab

dotnet-maestro bot and others added 14 commits August 28, 2023 16:02

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

99518ba

…828.6 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23425.10 -> To Version 8.0.100-beta.23428.6

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

15d1506

…230828.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23428-02

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

e29f321

…0828.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-07

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

35b6e5d

…0828.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-08

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

d623e8f

…0828.9 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-09

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

c76399b

…als (dotnet#34976)

[release/8.0.1xx] Update dependencies from dotnet/msbuild (dotnet#34975)

1e47794

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

40dbc57

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

9f32a83

…4969)

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

3a35634

…0829.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-09 -> To Version 17.8.0-preview-23429-01

[release/8.0.1xx] Enable Windows thread pool config switch via Projec…

3c165db

…t file (dotnet#34943)

dotnet-maestro-bot requested a review from a team as a code owner August 29, 2023 03:43

dotnet-maestro-bot force-pushed the merge/release/8.0.1xx-to-main branch from 735dda6 to 3c165db Compare August 29, 2023 03:43

ghost added Area-Infrastructure untriaged Request triage from a team member labels Aug 29, 2023

dotnet-maestro bot and others added 6 commits August 29, 2023 04:07

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

0111820

…0829.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-09 -> To Version 17.8.0-preview-23429-02

[release/8.0.1xx] Update dependencies from dotnet/msbuild (dotnet#34989)

d8a3062

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

429e98b

…34974)

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

33fce09

…34984)

Merge branch 'release/8.0.1xx'

4f8b93f

v-wuzhai force-pushed the merge/release/8.0.1xx-to-main branch from 40152cf to 4f8b93f Compare August 29, 2023 06:08

v-wuzhai requested a review from a team August 29, 2023 06:09

dsplaisted approved these changes Aug 29, 2023

View reviewed changes

Merge branch 'main' into merge/release/8.0.1xx-to-main

3cdfc7d

dsplaisted enabled auto-merge August 29, 2023 21:25

dsplaisted merged commit 5065b05 into dotnet:main Aug 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

dotnet-maestro-bot commented Aug 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

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

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

Uh oh!

Conversation

dotnet-maestro-bot commented Aug 29, 2023

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants