mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1211 from dotnet/ericstj/fixNuspecDiffs

Browse source 
Fix diffs in generated nuspec with nuget.core
This commit is contained in:
Eric StJohn 2016-02-03 22:53:29 -08:00
commit 0e8d52ee7f
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dotnet/commands/dotnet-pack/NuGet/ManifestContentFiles.cs
View file

@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Xml.Serialization;
namespace NuGet
{
public class ManifestContentFiles

9
src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs
View file

@ -35,13 +35,16 @@ namespace NuGet
elem.Add(new XElement(ns + "id", metadata.Id));
elem.Add(new XElement(ns + "version", metadata.Version.ToString()));
AddElementIfNotNull(elem, ns, "title", metadata.Title);
elem.Add(new XElement(ns + "requireLicenseAcceptance", metadata.RequireLicenseAcceptance));
elem.Add(new XElement(ns + "developmentDependency", metadata.DevelopmentDependency));
AddElementIfNotNull(elem, ns, "authors", metadata.Authors, authors => string.Join(",", authors));
AddElementIfNotNull(elem, ns, "owners", metadata.Owners, owners => string.Join(",", owners));
AddElementIfNotNull(elem, ns, "licenseUrl", metadata.LicenseUrl);
AddElementIfNotNull(elem, ns, "projectUrl", metadata.ProjectUrl);
AddElementIfNotNull(elem, ns, "iconUrl", metadata.IconUrl);
elem.Add(new XElement(ns + "requireLicenseAcceptance", metadata.RequireLicenseAcceptance));
if (metadata.DevelopmentDependency == true)
{
elem.Add(new XElement(ns + "developmentDependency", metadata.DevelopmentDependency));
}
AddElementIfNotNull(elem, ns, "description", metadata.Description);
AddElementIfNotNull(elem, ns, "summary", metadata.Summary);
AddElementIfNotNull(elem, ns, "releaseNotes", metadata.ReleaseNotes);
@ -218,7 +221,7 @@ namespace NuGet
files.Select(file =>
new XElement(ns + File,
new XAttribute("src", file.Source),
new XAttribute("target", file.Source),
new XAttribute("target", file.Target),
new XAttribute("exclude", file.Exclude)
)));
}