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.8' => 'main' #9272

Merged
merged 6 commits into from
Sep 27, 2023

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

# 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-maestro-bot/msbuild HEAD:merge/vs17.8-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs17.8-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.8-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/vs17.8-to-main main
git pull https://github.com/dotnet-maestro-bot/msbuild merge/vs17.8-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/msbuild HEAD:merge/vs17.8-to-main
or if you are using SSH
git checkout -b merge/vs17.8-to-main main
git pull git@github.com:dotnet-maestro-bot/msbuild merge/vs17.8-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs17.8-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

YuliiaKovalova and others added 5 commits September 22, 2023 15:16
This allows an opt-in workaround for dotnet#9250 that affected deployment
processes can use, mitigating the risk of entirely reverting dotnet#8685.
TaskHostTaskComplete packets can be sent between nodes that differ in
FEATURE_REPORTFILEACCESS, causing confusion when the sending side (for
example a net35 taskhost) does not send the FileAccessData field, but
the receiving side (net48) expects it.

Unify this by explicitly sending a bool `false` (no data) in the
!FEATURE_REPORTFILEACCESS case, so there's no difference on the
receiving end between "no data" and "couldn't be any data".
Opting out of 17.8 features (via changewaves env variable) while
`EnableUnsafeBinaryFormatterSerialization` is not allowed by the runtime
can lead to MSBuild crashing ungracefully.

This is because BinaryFormatter serialization usage in core now leads to
runtime failures (as of 8.0) unless explicitly opted-in by user. So
MSBuild moved to alternative (secure) serialization. MSBuild normally
allows users to opt out of the last batch of changes - with changewaves.
In this specific case it can mean shooting self into foot without
realizing.

Resolution: Ignoring the opt-out of the new secure serialization unless
the BinaryFormatter is explicitly allowed by user in runtime (by editing
`MSBuild.runtimeconfig.json` in the SDK).
…r-new-field' into vs17.8

And bump version to 17.8.1
@YuliiaKovalova YuliiaKovalova merged commit 26a4fc6 into dotnet:main Sep 27, 2023
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