Fix copying of build assets when publish assets differ. #2666
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
When publish copy-local assets differ from build copy-local assets (for example, runtime store packages were excluded), a typo when adding the reference copy local items caused items that were copied local for build to be included in publish output. This was caught by a CLI test that uses a manifest to exclude a package and then runs the output of the publish operation, expecting it to fail because the dependency was not copied locally (and no runtime store is used). This change will fix the failing CLI test.
peterhuene
commented
Nov 15, 2018
| <ItemGroup> | ||
| <_ResolvedCopyLocalPublishAssets Include="@(ReferenceCopyLocalPaths)" | ||
| Exclude="@(_ResolvedCopyLocalPublishAssets)" | ||
| Exclude="@(_ResolvedCopyLocalBuildAssets)" |
There was a problem hiding this comment.
Explanation of change: ReferenceCopyLocalPaths is a superset of _ResolvedCopyLocalBuildAssets when we copy local package assets for build. The intention of this was to add the subset of copy local paths that were not copied local from the build assets (_ResolvedCopyLocalPublishAssets may be a different set of items that was resolved just for publish). If we're reusing the build copy local assets, then _ResolvedCopyLocalPublishAssets will already contain _ResolvedCopyLocalBuildAssets.
livarcocc
approved these changes
Nov 15, 2018
wli3
pushed a commit
that referenced
this pull request
Feb 7, 2020
…0190905.2 (#2666) - Microsoft.Build - 16.3.0-preview-19455-02
wli3
pushed a commit
that referenced
this pull request
Feb 7, 2020
… merges/release/3.0.100-preview9-to-release/3.0.1xx * upstream/release/3.0.100-preview9: (21 commits) Update dependencies from https://github.com/Microsoft/msbuild build 20190906.2 (#2779) Update dependencies from https://github.com/dotnet/cli build 20190908.6 (#2728) Update dependencies from https://github.com/dotnet/sdk build 20190908.1 (#2726) Update dependencies from https://github.com/dotnet/cli build 20190908.2 (#2715) Update dependencies from https://github.com/aspnet/websdk build 20190908.1 (#2713) Update dependencies from https://github.com/dotnet/cli build 20190907.12 (#2710) Update dependencies from https://github.com/dotnet/cli build 20190907.11 (#2707) Update dependencies from https://github.com/aspnet/websdk build 20190907.5 (#2706) Update dependencies from https://github.com/dotnet/cli build 20190907.9 (#2705) Update dependencies from https://github.com/aspnet/websdk build 20190907.4 (#2704) Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190907.3 (#2702) Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190906.6 (#2675) Update dependencies from https://github.com/dotnet/cli build 20190906.12 (#2670) Update dependencies from https://github.com/dotnet/sdk build 20190906.2 (#2669) Update dependencies from https://github.com/Microsoft/msbuild build 20190905.2 (#2666) Update dependencies from https://github.com/dotnet/core-setup build 20190906.20 (#2668) Update dependencies from https://github.com/dotnet/cli build 20190906.11 (#2667) Update dependencies from https://github.com/dotnet/core-setup build 20190906.12 (#2659) Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190905.12 (#2633) Update dependencies from https://github.com/Microsoft/msbuild build 20190830.3 (#2618) ... Conflicts: eng/Version.Details.xml eng/Versions.props
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When publish copy-local assets differ from build copy-local assets (for
example, runtime store packages were excluded), a typo when adding the
reference copy local items caused items that were copied local for build to be
included in publish output.
This was caught by a CLI test that uses a manifest to exclude a package and
then runs the output of the publish operation, expecting it to fail because the
dependency was not copied locally (and no runtime store is used).
This change will fix the failing CLI test.