Skip to content

Commit bc3e94a

Browse files
committed
Missing part of the previous fix to pack private assets
1 parent 88edf4a commit bc3e94a

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

src/NuGetizer.Tasks/CreatePackage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,8 @@ void AddDependencies(Manifest manifest)
240240
{
241241
var dependencies = from item in Contents
242242
where PackFolderKind.Dependency.Equals(item.GetMetadata(MetadataName.PackFolder), StringComparison.OrdinalIgnoreCase) &&
243-
!"all".Equals(item.GetMetadata(MetadataName.PrivateAssets), StringComparison.OrdinalIgnoreCase)
243+
(!"all".Equals(item.GetMetadata(MetadataName.PrivateAssets), StringComparison.OrdinalIgnoreCase) ||
244+
"true".Equals(item.GetMetadata("Pack"), StringComparison.OrdinalIgnoreCase))
244245
select new Dependency
245246
{
246247
Id = item.ItemSpec,

src/NuGetizer.Tests/InlineProjectTests.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ public void when_packagepath_ends_in_path_then_packs_basedir_dir()
10571057
[Fact]
10581058
public void when_dependency_is_development_dependency_then_can_explicitly_pack_it()
10591059
{
1060-
var result = Builder.BuildProject(
1060+
var project =
10611061
"""
10621062
<Project Sdk="Microsoft.NET.Sdk">
10631063
<PropertyGroup>
@@ -1068,8 +1068,8 @@ public void when_dependency_is_development_dependency_then_can_explicitly_pack_i
10681068
<PackageReference Include="ThisAssembly.Constants" Version="1.2.14" Pack="true" TargetFramework="netstandard2.0" />
10691069
</ItemGroup>
10701070
</Project>
1071-
"""
1072-
, "GetPackageContents", output);
1071+
""";
1072+
var result = Builder.BuildProject(project, "GetPackageContents", output);
10731073

10741074
result.AssertSuccess(output);
10751075

@@ -1078,7 +1078,23 @@ public void when_dependency_is_development_dependency_then_can_explicitly_pack_i
10781078
Identity = "ThisAssembly.Constants",
10791079
PackFolder = "Dependency",
10801080
}));
1081-
}
10821081

1082+
result = Builder.BuildProject(project, "Pack", output);
1083+
1084+
result.AssertSuccess(output);
1085+
1086+
var package = result.Items[0].ItemSpec;
1087+
File.Exists(package);
1088+
1089+
using (var archive = ZipFile.OpenRead(package))
1090+
{
1091+
Assert.Contains(archive.Entries, entry => entry.FullName == "scenario.nuspec");
1092+
using var stream = archive.Entries.First(x => x.FullName == "scenario.nuspec").Open();
1093+
var manifest = Manifest.ReadFrom(stream, false);
1094+
Assert.NotEmpty(manifest.Metadata.DependencyGroups);
1095+
Assert.NotEmpty(manifest.Metadata.DependencyGroups.First().Packages);
1096+
Assert.Equal("ThisAssembly.Constants", manifest.Metadata.DependencyGroups.First().Packages.First().Id);
1097+
}
1098+
}
10831099
}
10841100
}

0 commit comments

Comments
 (0)