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.

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

Calculate PackageConflictPreferredPackages from KnownFrameworkReference items #3459

Merged
merged 2 commits into from
Jul 26, 2019

Conversation

dsplaisted
Copy link
Member

@dsplaisted dsplaisted commented Jul 24, 2019

Use KnownFrameworkReference metadata to calculate PackageConflictPreferredPackages instead of hardcoding. The hardcoded values were incorrect after the runtime packs had been renamed.

I haven't figured out a good way to test this, as the behavior would only be observable when you reference a package with an asset that matches the assembly and file versions of the same asset in a runtime pack. But there's not a good way to determine which package version you would need to reference to line these up.

Fix #3362

@dsplaisted dsplaisted marked this pull request as ready for review July 25, 2019 00:53
@dsplaisted dsplaisted requested a review from a team July 25, 2019 01:38
@dsplaisted dsplaisted merged commit 27f6210 into dotnet:master Jul 26, 2019
dsplaisted pushed a commit to dsplaisted/sdk that referenced this pull request Feb 19, 2020
dsplaisted pushed a commit to dsplaisted/sdk that referenced this pull request Feb 19, 2020
* master: (27 commits)
  Add DOTNET_ROOT to tests and fix dogfood script
  Remove duplicated key
  Installation script update (dotnet#13030)
  Use scanelf over ldconfig on musl-libc distros (dotnet#12642)
  Allow list more properties (dotnet#3459)
  Update dependencies from https://github.com/mono/linker build 20191106.1 (dotnet#3476)
  [master] Update dependencies from aspnet/websdk (dotnet#3466)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20191105.3 (dotnet#3473)
  Update dependencies from https://github.com/dotnet/windowsdesktop build 20191105.1 (dotnet#3469)
  Update dependencies from https://github.com/dotnet/arcade build 20191104.3 (dotnet#3465)
  Update dependencies from https://github.com/aspnet/websdk build 20191103.2 (dotnet#3454)
  [master] Update dependencies from dotnet/arcade (dotnet#3416)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.3 (dotnet#3458)
  Update dependencies from https://github.com/dotnet/templating build 20191104.1 (dotnet#3457)
  [master] Update dependencies from Microsoft/msbuild (dotnet#3423)
  [master] Update dependencies from aspnet/AspNetCore (dotnet#3440)
  Update dependencies from https://github.com/dotnet/windowsdesktop build 20191104.2 (dotnet#3455)
  [master] Update dependencies from dotnet/core-setup (dotnet#3445)
  Update dependencies from https://github.com/dotnet/windowsdesktop build 20191102.6 (dotnet#3446)
  Update dependencies from https://github.com/aspnet/websdk build 20191102.2 (#3444)
  ...
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.

Conflict resolution broken for self-contained APP when packages have same version as shared framework
2 participants