Skip to content

Conversation

@github-actions
Copy link
Contributor

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.

merge button instructions

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 vs17.14
git pull --ff-only
git checkout vs18.0
git pull --ff-only
git merge --no-ff vs17.14

# 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/msbuild HEAD:merge/vs17.14-to-vs18.0
or if you are using SSH
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0

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/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.

git fetch
git checkout -b merge/vs17.14-to-vs18.0 origin/vs18.0
git pull https://github.com/dotnet/msbuild merge/vs17.14-to-vs18.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0
or if you are using SSH
git fetch
git checkout -b merge/vs17.14-to-vs18.0 origin/vs18.0
git pull [email protected]:dotnet/msbuild merge/vs17.14-to-vs18.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.14-to-vs18.0

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.

dotnet-maestro bot and others added 2 commits November 10, 2025 10:33
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]>
@github-actions github-actions bot requested a review from a team as a code owner November 20, 2025 09:46
Copy link
Member

@YuliiaKovalova YuliiaKovalova left a 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

@YuliiaKovalova YuliiaKovalova enabled auto-merge (squash) November 20, 2025 10:24
@github-actions
Copy link
Contributor Author

❌ 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.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@YuliiaKovalova
Copy link
Member

❌ 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. You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@GangWang01 please take a look

@github-actions
Copy link
Contributor Author

❌ 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.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@GangWang01
Copy link
Member

❌ 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. You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@GangWang01 please take a look

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.

@GangWang01 GangWang01 closed this Nov 21, 2025
auto-merge was automatically disabled November 21, 2025 01:54

Pull request was closed

@GangWang01 GangWang01 deleted the merge/vs17.14-to-vs18.0 branch November 21, 2025 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants