Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

Updating Packaging.targets to support specifying the PackageType #2100

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Updating Packaging.targets to support specifying the PackageType #2100

merged 1 commit into from
Jul 19, 2018

Conversation

@tannergooding
Copy link
Member

@tannergooding tannergooding commented Jul 17, 2018

FYI. @weshaggard, this is the buildtools change required to support moving the ILProj SDK into CoreCLR (see dotnet/arcade#317 for more details).

tannergooding
tannergooding commented Jul 17, 2018
View reviewed changes
src/Microsoft.DotNet.Build.Tasks.Packaging/src/PackageFiles/Packaging.targets
Files="@(_packageFile)"
Serviceable="$(Serviceable)"/>
Serviceable="$(Serviceable)"
PackageTypes="$(PackageType)"/>

This comment was marked as spam.

Sign in to view

tannergooding
tannergooding commented Jul 17, 2018
View reviewed changes
src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs Outdated
private List<PackageType> GetPackageTypes()
{
var packageTypes = from p in PackageTypes.NullAsEmpty()
select new PackageType(p.ItemSpec, PackageType.EmptyVersion);

This comment was marked as spam.

Sign in to view

tannergooding
tannergooding commented Jul 17, 2018
View reviewed changes
src/Microsoft.DotNet.Build.Tasks.Packaging/src/GenerateNuSpec.cs Outdated

public string Tags { get; set; }

public ITaskItem[] PackageTypes { get; set; }

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@weshaggard
Copy link
Member

weshaggard commented Jul 17, 2018

@ericstj could you please take a look?

@tannergooding
Copy link
Member Author

tannergooding commented Jul 18, 2018 •
edited
Loading

What is the Pre-Merge signing tool job and do I need to wait for it before merging?

Attempting to navigate to the details tells me:

Error: temporarily_unavailable

@ericstj
Copy link
Member

ericstj commented Jul 18, 2018

Pre-Merge signing tool

Changes in buildtools must be signed by the contributor. We should make sure you're on the list for folks with permission to do that. Can you try again (it appears to be up for me)? If it still is not working then @markwilkie or @mmitche may be able to help get you on the right list.

@tannergooding
Copy link
Member Author

tannergooding commented Jul 18, 2018

Updated the code to take a string[] and just copied the ~12 lines of code from ParsePackageTypes: https://github.com/NuGet/NuGet.Client/blob/50af5271b98ac5cb2896a707569bc4cd1e87a017/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs#L338, as that is probably better then silently doing the wrong thing or failing. -- See #2100 (comment) for more details.

@tannergooding
Copy link
Member Author

tannergooding commented Jul 18, 2018

Fixed to not depend on Array.Empty<T> so that the desktop build works.

@ericstj
Copy link
Member

ericstj commented Jul 18, 2018

Test Innerloop Ubuntu14.04 Debug

@tannergooding tannergooding merged commit c1916ce into dotnet:master Jul 19, 2018
@tannergooding tannergooding mentioned this pull request Jul 19, 2018
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@ericstj ericstj ericstj approved these changes

@weshaggard weshaggard weshaggard approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tannergooding @weshaggard @ericstj