Skip to content
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

[automated] Merge branch 'vs17.12' => 'main' #11015

Open
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the vs17.12 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.12 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.12
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs17.12

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

rainersigwald and others added 5 commits November 19, 2024 18:18
Remote (built in another node) projects were not
respecting MSBuildWarningsNotAsErrors configured
in the projects, when the API or CLI `-warnaserror`
option was enabled.

Fixes #10874.
* Update dependencies from https://github.com/dotnet/arcade build 20241112.13

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13

* Update VersionPrefix to 17.12.10

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Backport of #10892 to vs17.12

Work item (Internal use): 

### Summary

Respect warning-as-error settings configured per-project when
`-warnaserror` is passed on the command line.

### Customer Impact

Suppressing warnings is unnecessarily complicated and fails for
confusing reasons.

### Regression?

No, this behavior is longstanding, but the severity is higher with NuGet
Audit because NuGet advises configuring warning-as-warning for audit
warning codes.

### Testing

Automated and targeted scenario tests.

### Risk

Low: makes an existing opt-in codepath default.
@github-actions github-actions bot requested a review from a team as a code owner November 21, 2024 08:46
…rning properties (#11007)

Backports #10942 to vs17.12

* add WarningsAsMessages, WarningsAsErrors, WarningsNotAsErrors and TreatWarningsAsErrors to the engine (e.g. variant without prefix). test those so that nothing breaks

* Backport changwave 17.14 to 17.12

Normally we wouldn't have this changewave in this release, but because
we want to have a consistent changewave for behavior changed after
release, we're backporting it.

* Bump version

---------

Co-authored-by: Rainer Sigwald <[email protected]>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.12 by the following committers:

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