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.

Sign up for GitHub

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

Jump to bottom

Fix duplicate resolved files to publish #3320

Merged
merged 2 commits into from
Jun 12, 2019
Merged

Fix duplicate resolved files to publish #3320

merged 2 commits into from
Jun 12, 2019

Conversation

nguerrera
Copy link
Contributor

Fix #3257

There were two issues.

  1. A misunderstanding of msbuild batching rules and unqualified metadata caused satellite assemblies to be included twice (from same source location) into the publish list. (See Help understanding some batching behavior msbuild#4429)
  2. There are assemblies with the same name and version in multiple frameworks. We have to choose one arbitrarily.

@nguerrera nguerrera requested review from dsplaisted, peterhuene, ericstj and a team June 11, 2019 18:49
nguerrera
nguerrera commented Jun 11, 2019
View reviewed changes
src/Tasks/Common/ConflictResolution/ConflictResolver.cs
int cmp = string.CompareOrdinal(item1.PackageId, item2.PackageId);
if (cmp != 0)
{
return cmp < 0 ? item1 : item2;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should probably be logging here, but I want to make a pass over all the logging in this task: see #3319

@nguerrera nguerrera merged commit 9d81590 into dotnet:master Jun 12, 2019
dsplaisted pushed a commit to dsplaisted/sdk that referenced this pull request Feb 19, 2020
@dotnet-maestro
Update dependencies from https://github.com/aspnet/AspNetCore build 2…
f062597 
…0191025.3 (dotnet#3320)

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19525.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsplaisted dsplaisted dsplaisted approved these changes

@peterhuene peterhuene peterhuene approved these changes

@ericstj ericstj Awaiting requested review from ericstj

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Double write during publish
3 participants
@nguerrera @dsplaisted @peterhuene