[automated] Merge branch 'release/8.0' => 'release/8.0-staging'

[dotnet-maestro-bot]

I detected changes in the release/8.0 branch which have not been merged yet to release/8.0-staging. I'm a robot and am configured to help you automatically keep release/8.0-staging up to date, so I've opened this PR.

This PR merges commits made on release/8.0 by the following committers:

• github-actions[bot]
• dotnet-maestro[bot]

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
git pull --ff-only
git checkout release/8.0-staging
git pull --ff-only
git merge --no-ff release/8.0

# 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/runtime HEAD:merge/release/8.0-to-release/8.0-staging

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-to-release/8.0-staging

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-to-release/8.0-staging'. 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-to-release/8.0-staging release/8.0-staging
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-to-release/8.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-to-release/8.0-staging

or if you are using SSH

git checkout -b merge/release/8.0-to-release/8.0-staging release/8.0-staging
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/8.0-to-release/8.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-to-release/8.0-staging

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.

[carlossanlop]

Merge commit.

[carlossanlop]

@lewing this failure is less urgent to address because it's just the flow into staging, but this PR contains the stable branding commit as well as all the commits you worked on in the last couple of days:

    Wasi.Build.Tests.WasiTemplateTests.ConsoleBuildThenPublish(config: "Debug") [FAIL]
      Runtime pack path doesn't match.
      Expected: '/root/helix/work/workitem/e/dotnet-latest/packs/Microsoft.NETCore.App.Runtime.Mono.wasi-wasm/8.0.0'
      Actual:   '/root/helix/work/workitem/e/dotnet-latest/packs/Microsoft.NETCore.App.Runtime.Mono.wasi-wasm/8.0.0-rtm.23520.16'
      Stack Trace:
        /_/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs(346,0): at Wasm.Build.Tests.BuildTestBase.AssertRuntimePackPath(String buildOutput, String targetFramework)
        /_/src/mono/wasi/Wasi.Build.Tests/BuildTestBase.cs(251,0): at Wasm.Build.Tests.BuildTestBase.BuildProject(BuildArgs buildArgs, String id, BuildProjectOptions options)
        /_/src/mono/wasi/Wasi.Build.Tests/WasiTemplateTests.cs(36,0): at Wasi.Build.Tests.WasiTemplateTests.ConsoleBuildThenPublish(String config)
           at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
           at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
      Output:
        [] Executing (Captured Output) - /root/helix/work/workitem/e/dotnet-latest/dotnet new wasiconsole  -  in pwd /root/helix/work/workitem/e/wbt/Debug_bnguocvj_t1l
        [] The template "Wasi Console App" was created successfully.
        [] 
        -------- Building ---------

[lewing]

@carlossanlop I pushed #94097 directly here to verify it was the same issue

@joeloff we should discuss how to make the wbt logic work with workload sets

[carlossanlop]

I pushed #94097 directly here to verify it was the same issue

Thanks @lewing. Unfortunately, there are still failures.

[lewing]

I pushed #94097 directly here to verify it was the same issue

Thanks @lewing. Unfortunately, there are still failures.

I stopped doing the work in both, this build should be green

[lewing]

needs another exclusion

[lewing]

Only failure is known, build analysis is stuck?

cc @agocke @JulieLeeMSFT

[carlossanlop]

@lewing thanks for fixing the issues.

This was squash-merged instead of merge-commited, wasn't it? If yes, just letting you know that it will cause some merge conflict problems on the next flow to internal.

Normally the "merge commit" option is disabled in the repo Settings, and I enable it when I need to merge one of these flow PRs, then disable it again.