[automated] Merge branch 'vs17.8' => 'main' #9328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… content items from reference project to match thebehavior in VS tooling.
dotnet-maestro-bot
force-pushed
the
merge/vs17.8-to-main
branch
from
7d58852 to
60258cb
Compare
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.
…ratingBindingRedirects-touch' (dotnet#9338) into vs17.8
…: 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
|
This pull request has been updated. This PR merges commits made on vs17.8 by the following committers: |
1 similar comment
|
This pull request has been updated. This PR merges commits made on vs17.8 by the following committers: |
rainersigwald
added a commit
to dotnet-maestro-bot/msbuild
that referenced
this pull request
Oct 19, 2023
|
@maridematte I noticed your attempt resolving API compatibility errors of the commit |
GangWang01
force-pushed
the
merge/vs17.8-to-main
branch
from
c7c3fcb to
676d908
Compare
maridematte
approved these changes
Oct 25, 2023
JaynieBai
approved these changes
Oct 25, 2023
Suppress package-compat warnings related to dotnet#9330. Co-authored-by: Mariana Dematte <magarces@microsoft.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
rainersigwald
force-pushed
the
merge/vs17.8-to-main
branch
from
676d908 to
04fde49
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.