-
Notifications
You must be signed in to change notification settings - Fork 1.4k
[automated] Merge branch 'vs17.14' => 'vs18.0' #12794
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This pull request updates the following dependencies [marker]: <> (Begin:15388ba0-faaf-4906-bba2-a9b719e812a4) ## From https://github.com/dotnet/arcade - **Subscription**: [15388ba0-faaf-4906-bba2-a9b719e812a4](https://maestro.dot.net/subscriptions?search=15388ba0-faaf-4906-bba2-a9b719e812a4) - **Build**: [20251105.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2832013) ([289663](https://maestro.dot.net/channel/5175/github:dotnet:arcade/build/289663)) - **Date Produced**: November 5, 2025 7:38:32 PM UTC - **Commit**: [9eaf7b289d5003a94ee23658f057a6c06ddcd570](dotnet/arcade@9eaf7b2) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [9.0.0-beta.25515.2 to 9.0.0-beta.25555.4][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XliffTasks - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6666973...9eaf7b2 [DependencyUpdate]: <> (End) [marker]: <> (End:15388ba0-faaf-4906-bba2-a9b719e812a4) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>
YuliiaKovalova
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the change isn't needed in vs18.0 since this branch already has .net task host implementation
|
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.14, but I could not automatically push those to merge/vs17.14-to-vs18.0 to update this PR. |
@GangWang01 please take a look |
|
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs17.14, but I could not automatically push those to merge/vs17.14-to-vs18.0 to update this PR. |
This vs17.14-based branch was merged with vs18.0 by resolving the conflicts. New update to vs17.14 is not able to be merged. We need to close this PR and get a new one. |
I detected changes in the vs17.14 branch which have not been merged yet to vs18.0. I'm a robot and am configured to help you automatically keep vs18.0 up to date, so I've opened this PR.
This PR merges commits made on vs17.14 by the following committers:
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.14-to-vs18.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.