Skip to content

Generate PlatformManifest and package conflict overrides for Microsoft.AspNetCore.App #4072

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

Merged
merged 3 commits into from
Nov 17, 2018

Conversation

natemcmaster
Copy link
Contributor

This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.

Resolves #3609

Examples of the build output created:

Microsoft.AspNetCore.App.props
Microsoft.AspNetCore.App.PlatformManifest.txt

Copy link
Member

@dsplaisted dsplaisted left a comment

Choose a reason for hiding this comment

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

I didn't look at the implementation, but the build output looks correct.

@natemcmaster natemcmaster changed the base branch from namc/fx-refs to master November 16, 2018 23:16
…t.AspNetCore.App

This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.
@@ -1,7 +1,11 @@
# Don't run CI for this config
trigger: none
Copy link
Contributor

Choose a reason for hiding this comment

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

What's this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This disables the PR validation trigger when we push to branches. PR validation only needs to run on PRs.

{
var platformManifestPath = Path.Combine(TestData.GetManifestOutputDir(), "Microsoft.AspNetCore.App.PlatformManifest.txt");
var expectedAssemblies = TestData.GetSharedFxDependencies()
.Split(';', StringSplitOptions.RemoveEmptyEntries)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is RemoveEmptyEntries really needed? Or would it just mask potential bugs where we put blank entries in the metadata?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not in this case. I'm only using remove empty entries on TestData.GetSharedFxDependencies(), which is test data generated in the unit test csproj file. The data isn't used in the product.

Copy link
Contributor

@Eilon Eilon left a comment

Choose a reason for hiding this comment

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

A few small comments/questions.

@natemcmaster natemcmaster merged commit fd1a5b4 into master Nov 17, 2018
@natemcmaster natemcmaster deleted the namc/overrides branch November 17, 2018 00:36
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.

Handle conflicts between a ref-only Microsoft.AspNetCore.App and individual packages
4 participants