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

Commit 2906fd2

Browse files
committed
Don't pack @(PackageReference) when %(Pack)==false
1 parent dfa20c0 commit 2906fd2

1 file changed

Lines changed: 23 additions & 16 deletions

File tree

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Inference.targets

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,25 @@ Copyright (c) .NET Foundation. All rights reserved.
4545
</GetPackageContentsDependsOn>
4646
</PropertyGroup>
4747

48+
<!-- Extend some built-in items with metadata we use in our inference targets -->
49+
<ItemDefinitionGroup>
50+
<PackageReference>
51+
<Pack />
52+
</PackageReference>
53+
<ReferencePath>
54+
<Facade>false</Facade>
55+
<FrameworkFile>false</FrameworkFile>
56+
<NuGetPackageId />
57+
<Pack />
58+
</ReferencePath>
59+
<_ReferenceRelatedPaths>
60+
<Facade>false</Facade>
61+
<FrameworkFile>false</FrameworkFile>
62+
<NuGetPackageId />
63+
<Pack />
64+
</_ReferenceRelatedPaths>
65+
</ItemDefinitionGroup>
66+
4867
<Target Name="_PrimaryOutputFrameworkSpecific" Returns="$(PrimaryOutputFrameworkSpecific)">
4968
<!-- Determine whether primary output is framework specific -->
5069
<ItemGroup Condition="'$(PrimaryOutputFrameworkSpecific)' == ''">
@@ -131,7 +150,10 @@ Copyright (c) .NET Foundation. All rights reserved.
131150
</_InferredPackageFile>
132151

133152

134-
<_InferredPackageFile Include="@(PackageReference)" Condition="'%(PackageReference.Identity)' != 'NuGet.Build.Packaging' and '%(PackageReference.Identity)' != 'NETStandard.Library' and '%(PackageReference.PrivateAssets)' != 'all'">
153+
<_InferredPackageFile Include="@(PackageReference)" Condition="'%(PackageReference.Identity)' != 'NuGet.Build.Packaging' and
154+
'%(PackageReference.Identity)' != 'NETStandard.Library' and
155+
'%(PackageReference.PrivateAssets)' != 'all' and
156+
'%(PackageReference.Pack)' != 'false'">
135157
<Kind>Dependency</Kind>
136158
</_InferredPackageFile>
137159

@@ -159,21 +181,6 @@ Copyright (c) .NET Foundation. All rights reserved.
159181
</ItemGroup>
160182
</Target>
161183

162-
<ItemDefinitionGroup>
163-
<ReferencePath>
164-
<Facade>false</Facade>
165-
<FrameworkFile>false</FrameworkFile>
166-
<NuGetPackageId />
167-
<Pack />
168-
</ReferencePath>
169-
<_ReferenceRelatedPaths>
170-
<Facade>false</Facade>
171-
<FrameworkFile>false</FrameworkFile>
172-
<NuGetPackageId />
173-
<Pack />
174-
</_ReferenceRelatedPaths>
175-
</ItemDefinitionGroup>
176-
177184
<Target Name="_CollectPrimaryOutputRelatedFiles" DependsOnTargets="BuildOnlySettings;ResolveReferences" Returns="@(_PrimaryOutputRelatedFile)">
178185
<ItemGroup>
179186
<_PrimaryOutputRelatedFile Include="@(ReferencePath);@(_ReferenceRelatedPaths)"

0 commit comments

Comments
 (0)