Skip to content

In nugetize tool, skip Authors metadata if it equals AssemblyName #339

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.

Sign up for GitHub

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 1 commit into from
Mar 2, 2023
Merged

In nugetize tool, skip Authors metadata if it equals AssemblyName #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/NuGetizer.Tasks/dotnet-nugetize.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<_NuspecFile>%(NuspecFile.FullPath)</_NuspecFile>
</PropertyGroup>
<ItemGroup>
<PackageMetadata Update="@(PackageMetadata)" Nuspec="$(_NuspecFile)" NuPkg="@(PackageTargetPath)" />
<PackageMetadata Update="@(PackageMetadata)" Nuspec="$(_NuspecFile)" NuPkg="@(PackageTargetPath)" AssemblyName="$(AssemblyName)" />
<PackageContent Include="@(_PackageContent)" Exclude="@(PackageMetadata)" />
</ItemGroup>
<!-- Force assign path if rendering contents only -->
Expand Down
8 changes: 8 additions & 0 deletions src/dotnet-nugetize/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,12 @@ int Execute()
var table = new Grid().AddColumn().AddColumn();
table.AddRow(new Text("Metadata:", yellow));

// We use this to detect Authors==AssemblyName and not render the property in that case
// since it's effectively like an empty value, akin to the default description.
var assemblyName = metadata.Element("AssemblyName");
if (assemblyName != null)
assemblyName.Remove();

foreach (var md in metadata.Elements()
.Where(x =>
x.Name != "PackageId" &&
Expand All @@ -298,6 +304,8 @@ int Execute()
{
if (md.Name.LocalName == "Description" && md.Value == "Package Description")
continue;
if (md.Name.LocalName == "Authors" && md.Value == assemblyName?.Value)
continue;

table.AddRow(new Text(md.Name.LocalName), new Text(md.Value));
}
Expand Down
5 changes: 5 additions & 0 deletions src/dotnet-nugetize/after.sln.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Target Name="RemoveNonNuGetized" BeforeTargets="GetPackageContents">

<ItemGroup>
<ProjectReference Remove="@(ProjectReference)" Condition="%(Extension) == '.metaproj'" />
</ItemGroup>
Expand All @@ -14,10 +16,13 @@
ContinueOnError="true">
<Output TaskParameter="TargetOutputs" ItemName="ReferencedProjectTargetPath" />
</MSBuild>

<ItemGroup>
<NuGetizedTargetPath Include="@(ReferencedProjectTargetPath -> WithMetadataValue('IsNuGetized', 'true'))" />
<NonNuGetizedTargetPath Include="@(ReferencedProjectTargetPath)" Exclude="@(NuGetizedTargetPath)" />
<ProjectReference Remove="@(NonNuGetizedTargetPath -> '%(MSBuildSourceProjectFile)')" />
</ItemGroup>

</Target>

</Project>