[automated] Merge branch 'vs17.0' => 'main' #6922
Merged
Conversation
This file contains hidden or 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
…908.11 (dotnet#6833) Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21427.7 -> To Version 5.0.0-beta.21458.11
Fixes #dotnet#6576 ### Context dotnet#6576 revealed that the `.copycomplete` file marker is updated even when the `Copy` task in `_GetCopyFilesMarkedLocal` doesn't _actually_ copy anything. This can mess with incremental builds. ### Changes Made This change adds an output parameter, `CopiedAtLeastOneFile` to the `Copy` task that the `Touch` task is now conditioned off of. ### Testing Tested local builds ### Notes This could also be done by having an ITaskItem[] that contains all files that were actually copied. Then the touch task could check if that item were empty. I opted for the straightforward route since the ITaskItem[] solution isn't needed yet, and this implementation can easily be changed when we do need that. Co-authored-by: Forgind <[email protected]>
…914.1 (dotnet#6850) Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21458.11 -> To Version 5.0.0-beta.21464.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update to SDK 5.0.401 Avoids NuGet signing issues and is generally newer and better. * Update eng\Versions.props * Update NuGetBuildTasksVersion in eng\Versions.props Co-authored-by: Ladi Prosek <[email protected]>
Skip Updating CopyComplete Marker When Not Necessary
Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21464.1 -> To Version 5.0.0-beta.21505.11
Fixes dotnet#6917 by ensuring that the copy-marker file is _always_ added to the FileWrites item if the copy-referenced-assemblies target runs so that IncrementalClean never sees it as an 'orphan' file and then deletes it.
ladipro
approved these changes
Oct 14, 2021
ladipro
added
the
merge-when-branch-open
|
@rainersigwald just saw your comment on #6866. It's the same backport so I'll wait for you. |
ladipro
removed
the
merge-when-branch-open
|
While we're still waiting for Tactics approval on this for 16.11 and 17.0 I think we must fix it for 17.1, so I think we can go ahead. As long as we merge, rather than squashing, I don't think we'll lose anything if Tactics for some reason doesn't approve. |
ladipro
added
the
merge-when-branch-open
These assemblies have moved and versioned in Visual Studio 2022. Update of the workaround for dotnet#1675 in dotnet#4139.
|
This pull request has been updated. This PR merges commits made on vs17.0 by the following committers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.0 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.0 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.0-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.