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

Ensure CoreCLR pkgproj include packaging props #39906

Merged
merged 1 commit into from
Jul 24, 2020

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Jul 24, 2020

Since these projects don't directly consume the nupkg they didn't
automatically get props when we added it.

Since these projects don't directly consume the nupkg they didn't
automatically get props when we added it.
@jkoritzinsky
Copy link
Member

Would it be worth updating the CoreCLR pkgproj projects to use the nupkg directly?

@ericstj
Copy link
Member Author

ericstj commented Jul 24, 2020

Not as part of this change. Need to unblock folks.

I'm not a huge fan of the way we consume this package in libraries either. We restore a single project that uses packages, then import that project's generated nuget-props and targets files.

Right longer term fix is to integrate pkgproj infra with normal SDK targets so that we can leverage them from any project type (CSProj, generic-proj, etc). That'll enable restore and provide the pkgproj content model.

Copy link
Member

@safern safern left a comment

Choose a reason for hiding this comment

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

LGTM given that we are planning on updating the way we consume this package across the board.

@ericstj ericstj merged commit 7ec5302 into dotnet:master Jul 24, 2020
ericstj added a commit to ericstj/runtime that referenced this pull request Jul 31, 2020
Since these projects don't directly consume the nupkg they didn't
automatically get props when we added it.
Anipik pushed a commit that referenced this pull request Jul 31, 2020
* Revert "Workaround duplicate package icon in packages (#39736)"

This reverts commit 498c798.

* Ensure CoreCLR pkgproj include packaging props (#39906)

Since these projects don't directly consume the nupkg they didn't
automatically get props when we added it.

* Fix issue with Crossgen2 package excluding Icon (#39972)

The latest packaging targets rely on ProjectDefaults inclusion of package icon,
but this item was being removed by the Crossgen2 project's targets.

Also updating the version of packaging tools to see if we have any other failures.
akoeplinger added a commit to dotnet/llvm-project that referenced this pull request Aug 3, 2020
dotnet-maestro bot added a commit to dotnet/llvm-project that referenced this pull request Aug 3, 2020
[release/9.x] Update dependencies from dotnet/arcade
- Updates:
  - Microsoft.DotNet.Build.Tasks.Packaging: from 5.0.0-beta.20364.3 to 5.0.0-beta.20374.1
  - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20364.3 to 5.0.0-beta.20374.1
  - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20364.3 to 5.0.0-beta.20374.1

 - Ensure pkgproj include packaging props

Same change as dotnet/runtime#39906

 - Update Directory.Build.props
Jacksondr5 pushed a commit to Jacksondr5/runtime that referenced this pull request Aug 10, 2020
Since these projects don't directly consume the nupkg they didn't
automatically get props when we added it.
@karelz karelz added this to the 5.0.0 milestone Aug 18, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 8, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants