[android] Bump to win 11 helix queue

[steveisok]

No description provided.

[ghost]

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

---

null

Author:	steveisok
Assignees:	steveisok
Labels:	area-Infrastructure-mono
Milestone:	-

[steveisok]

/cc @ilyas1974

[steveisok]

/azp run runtime-android

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[akoeplinger]

I assume we want to backport this?

[steveisok]

I assume we want to backport this?

Yes, we need to update it everywhere in runtime.

[steveisok]

/backport to release/8.0-staging

[github-actions]

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7451765874

[akoeplinger]

/backport to release/6.0-staging

[github-actions]

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/10735681750

[github-actions]

@akoeplinger backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [android] Bump to win 11 helix queue
Using index info to reconstruct a base tree...
M	eng/pipelines/coreclr/templates/helix-queues-setup.yml
M	eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
Auto-merging eng/pipelines/coreclr/templates/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/helix-queues-setup.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 [android] Bump to win 11 helix queue
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

[github-actions]

@akoeplinger an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.