[automated] Merge branch 'release/8.0.4xx' => 'main' #40824

dotnet-maestro-bot · 2024-05-10T21:01:56Z

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

marcpopMSFT
dotnet-maestro[bot]
v-wuzhai
Forgind
nkolev92
baronfel
vseanreesermsft

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

or if you are using SSH

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

or if you are using SSH

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

…6.11.0.26 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.26

…6.11.0.27 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.27

…6.11.0.28 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.28

…6.11.0.30 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.30

…6.11.0.31 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.31

…6.11.0.32 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.32

…6.11.0.34 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.34

…6.11.0.35 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.35

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

[release/8.0.3xx] Update dependencies from dotnet/arcade

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

…otnet#39614)

…6.11.0.35 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.35

…40668) [release/8.0.3xx] Update dependencies from dotnet/templating

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

…6.11.0.35 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.23 -> To Version 6.11.0-preview.1.35

Our reporter uses Console.Out and defaults it to the default code page (437). This changes it to use UTF8 encoding, which made the output look more like this: image instead of: image Fixes the SDK half of AB#2036256

Resolves dotnet#40005 and Resolves dotnet#37828 as well as one other bug I'd found. More specifically, it: Makes it an error if we resolve a workload set version when you asked for a different one. Adds a message to dotnet workload --info to indicate whether we're trying to use workload sets or not. Removes the version from individual workload manifests if we're configured to use a workload set. Fixes a typo (Manfiest --> Manifest) Ensures that if we have a workload set and some manifests specified in the install state file, that the workload set wins if it came from a global.json or the install state file but loses if it was just the highest-numbered workload set available when we're finding which manifests to use.

…ence-packages build 20240507.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.1 -> To Version 8.0.0-alpha.1.24257.2

…6.11.0.39 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.35 -> To Version 6.11.0-preview.1.39

…#40768)

…nce-packages (dotnet#40767)

…et#40640)

…0240509.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.400-preview.24226.1 -> To Version 8.0.400-preview.24259.1

…509.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.400-beta.24229.4 -> To Version 8.0.400-beta.24259.2

…10.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.24252.7 -> To Version 7.0.0-preview.24260.1

…6.11.0.45 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.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-preview.1.39 -> To Version 6.11.0-preview.2.45

…40810)

…#40814)

v-wuzhai · 2024-05-14T07:01:56Z

@dotnet/source-build-internal Could you take a look at the failures here?

MichaelSimons · 2024-05-14T15:19:25Z

@dotnet/source-build-internal Could you take a look at the failures here?

Looks to be an intermittent issue. Re-run passed.

marcpopMSFT · 2024-05-14T20:34:55Z

@Forgind to review and merge

dotnet-maestro bot and others added 30 commits April 18, 2024 12:54

Switch to using the nullable to capture other cases

5297991

Save...

4192aaa

Update branding to 8.0.301

8b757e4

Update branding to 8.0.301 (dotnet#40616)

12f93e2

[release/8.0.3xx] Update dependencies from dotnet/fsharp (dotnet#40568)

c025a8b

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

[release/8.0.3xx] Update dependencies from dotnet/arcade (dotnet#40468)

e9ed850

[release/8.0.3xx] Update dependencies from dotnet/arcade

[release/8.0.3xx] Update dependencies from dotnet/roslyn (dotnet#40380)

c9738e9

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

Use Ubuntu 24.04 Noble Numbat images by default starting in 8.0.300 (d…

5a038a8

…otnet#39614)

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

7c12378

…40668) [release/8.0.3xx] Update dependencies from dotnet/templating

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

e92a61a

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

Merge branch 'release/8.0.3xx' into release/8.0.4xx

612f086

marcpopMSFT and others added 16 commits May 7, 2024 14:04

[release/8.0.4xx] Update dependencies from dotnet/format (dotnet#40738)

f76c393

Fix reporter encoding (dotnet#40391)

419e4cb

Our reporter uses Console.Out and defaults it to the default code page (437). This changes it to use UTF8 encoding, which made the output look more like this: image instead of: image Fixes the SDK half of AB#2036256

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

d46bd0a

…ence-packages build 20240507.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.1 -> To Version 8.0.0-alpha.1.24257.2

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

7452e77

…#40768)

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

3e5be07

…nce-packages (dotnet#40767)

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (dotn…

9b611d2

…et#40640)

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

922061d

…0240509.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.400-preview.24226.1 -> To Version 8.0.400-preview.24259.1

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

42dbc46

…509.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.400-beta.24229.4 -> To Version 8.0.400-beta.24259.2

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

ef7cce1

…40810)

[release/8.0.4xx] Update dependencies from dotnet/fsharp (dotnet#40812)

fd259db

[release/8.0.4xx] Update dependencies from dotnet/razor (dotnet#40813)

6ccca52

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

ce554bb

…#40814)

dotnet-maestro-bot force-pushed the merge/release/8.0.4xx-to-main branch from 70cc181 to ce554bb Compare May 10, 2024 21:01

dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels May 10, 2024

dotnet-maestro-bot requested a review from a team as a code owner May 11, 2024 08:34

Merge branch 'release/8.0.4xx'

3b0773d

v-wuzhai force-pushed the merge/release/8.0.4xx-to-main branch from e48862a to 3b0773d Compare May 11, 2024 08:37

v-wuzhai requested a review from Forgind May 11, 2024 08:41

build-analysis bot mentioned this pull request May 11, 2024

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

3 tasks

v-wuzhai requested a review from a team May 13, 2024 07:07

Forgind approved these changes May 14, 2024

View reviewed changes

Forgind merged commit 9c00794 into dotnet:main May 14, 2024
24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/8.0.4xx' => 'main' #40824

[automated] Merge branch 'release/8.0.4xx' => 'main' #40824

dotnet-maestro-bot commented May 10, 2024

v-wuzhai commented May 14, 2024

MichaelSimons commented May 14, 2024

marcpopMSFT commented May 14, 2024

[automated] Merge branch 'release/8.0.4xx' => 'main' #40824

[automated] Merge branch 'release/8.0.4xx' => 'main' #40824

Conversation

dotnet-maestro-bot commented May 10, 2024

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

v-wuzhai commented May 14, 2024

MichaelSimons commented May 14, 2024

marcpopMSFT commented May 14, 2024