Skip to content

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 [email protected]: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 [email protected]:dotnet-maestro-bot/msbuild merge/vs17.8-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]: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.

rainersigwald and others added 4 commits October 17, 2023 16:00
0aa8c5f changed the behavior of `GenerateBindingRedirects` to always
touch its output file, to prevent false-negative up-to-date checks on
subsequent incremental builds. However, this causes breaks in customer
scenarios:

1. Build, generate a `.exe.config` and copy it to the output directory.
2. Run the app, do some operation that modifies the .exe.config.
3. Make some change and rebuild the app. The .exe.config in the output
   directory is overwritten with the "fresh" copy generated by this run.

A long-term fix is tracked by dotnet#9337 but for the short term we can revert
to the pre-17.7 behavior.
Make newly-added, not-yet-released cache-add API surface internal rather
than public to avoid having to maintain a clunky interface for the long
term.

End-to-end cache plugin tests against private MSBuild from this PR and
reported success.
…: Build ID 8555984 (dotnet#9344)

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

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8555984
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

1 similar comment
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@GangWang01
Copy link
Member

GangWang01 commented Oct 24, 2023

@maridematte I noticed your attempt resolving API compatibility errors of the commit Merge branch 'vs17.8' (dotnet#9328). You need to build with /p:ApiCompatGenerateSuppressionFile=true locally based on that commit to generated api compatibility suppressions for the api changes between vs17.8 and main. I'd also like to help to fix it.

@GangWang01 GangWang01 force-pushed the merge/vs17.8-to-main branch from c7c3fcb to 676d908 Compare October 25, 2023 03:14
Suppress package-compat warnings related to dotnet#9330.

Co-authored-by: Mariana Dematte <[email protected]>
Co-authored-by: Gang Wang <[email protected]>
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.

8 participants