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

Fix custom localization and packing of satellite assemblies #2084

Merged
merged 2 commits into from
May 17, 2017

Conversation

AArnott
Copy link
Contributor

@AArnott AArnott commented May 10, 2017

Add missing item type qualifier in Condition

This fixes SatelliteDllsProjectOutputGroup when SatelliteDllsProjectOutputGroupOutputIntermediate items already exist so that it doesn't double up and malform SatelliteDllsProjectOutputGroupOutputIntermediate items.

Preserve FinalOutputPath metadata if preset

When localization for an app occurs another way (like Microsoft's own LCL tooling) the FinalOutputPath isn't what is calculated here. We can preset it in the Intermediate items, but we need MSBuild to preserve that metadata when it is there.

AArnott added 2 commits May 9, 2017 21:50
This fixes SatelliteDllsProjectOutputGroup when SatelliteDllsProjectOutputGroupOutputIntermediate items already exist so that it doesn't double up and malform SatelliteDllsProjectOutputGroupOutputIntermediate items.
When localization for an app occurs another way (like Microsoft's own LCL tooling) the FinalOutputPath isn't what is calculated here. We can preset it in the Intermediate items, but we need MSBuild to preserve that metadata when it is there.
@AArnott
Copy link
Contributor Author

AArnott commented May 10, 2017

I discovered these bugs when trying to validate the fix for NuGet/Home#5160.
CC: @rohit21agrawal

@AArnott
Copy link
Contributor Author

AArnott commented May 10, 2017

@AndyGerlicher Am I targeting the right branch for a 15.3 release?

@AndyGerlicher AndyGerlicher merged commit c6e1a36 into dotnet:master May 17, 2017
@AArnott AArnott deleted the patch-1 branch May 17, 2017 18:59
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.

4 participants