Skip to content

Conversation

@github-actions
Copy link
Contributor

I detected changes in the vs17.14 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 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 main
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-main
or if you are using SSH
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.14-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/vs17.14-to-main'. 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-main origin/main
git pull https://github.com/dotnet/msbuild merge/vs17.14-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.14-to-main
or if you are using SSH
git fetch
git checkout -b merge/vs17.14-to-main origin/main
git pull [email protected]:dotnet/msbuild merge/vs17.14-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.14-to-main

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-bot and others added 2 commits April 7, 2025 11:29
…: Build ID 11340025 (#11683)

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 11340025

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 11340025

* Update Versions.props VersionPrefix

---------

Co-authored-by: Jenny Bai <[email protected]>
…ix (#11774)

A refactor to use collection expressions (eae7bbd) accidentally changed behavior on these lines--instead of appending to an existing list, the to-be-appended entries were used only if the existing list was `null`.

Fixes #11678.
@github-actions github-actions bot requested a review from a team as a code owner April 30, 2025 22:28
@surayya-MS surayya-MS self-assigned this May 2, 2025
@surayya-MS
Copy link
Member

surayya-MS commented May 2, 2025

The checks are failing wiht errors like:

artifacts/sb/src/src/Tasks/GenerateResource.cs(1708,50): error CS1061: (NETCORE_ENGINEERING_TELEMETRY=Build) 'ITaskItem[]' does not contain a definition for 'Concat' and no accessible extension method 'Concat' accepting a first argument of type 'ITaskItem[]' could be found (are you missing a using directive or an assembly reference?)

There wasn't any errors like this when merging to vs17.14 in this PR

After the investigation I found the cause of this. using System.Linq was removed as unnecessary in this PR, but we need it back for this particular change.

@surayya-MS surayya-MS merged commit 421590e into main May 2, 2025
10 checks passed
@surayya-MS surayya-MS deleted the merge/vs17.14-to-main branch May 2, 2025 15:44
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.

5 participants