Skip to content

Commit 6ad70a9

Browse files
committed
Fix copy error in inference targets for package icon
We were duplicating the logic for package readme files instead of package icon due to duplicated code. Fixes #436
1 parent 183de20 commit 6ad70a9

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/NuGetizer.Tasks/NuGetizer.Inference.targets

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ Copyright (c) .NET Foundation. All rights reserved.
290290
<_ExistingReadme Include="@(Content -> WithMetadataValue('Filename', '$(PackageReadmeFilename)'))" Condition="'@(_ExistingReadme)' == ''" />
291291
<_ExistingReadme Include="$(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)" Condition="'@(_ExistingReadme)' == '' and Exists('$(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)')" />
292292

293-
<InferenceCandidate Include="@(_ExistingReadme)"
293+
<InferenceCandidate Include="@(_ExistingReadme -> Distinct())"
294294
PackagePath="%(Filename)%(Extension)"
295295
Condition="'%(Extension)' == '$(PackageReadmeExtension)'" />
296296
</ItemGroup>
@@ -306,15 +306,13 @@ Copyright (c) .NET Foundation. All rights reserved.
306306

307307
<!-- Even if all these conditions are false, the user can still explicitly pack the icon file, of course -->
308308
<ItemGroup Label="Icon" Condition="'$(PackageIcon)' != ''">
309-
<_ExistingIcon Include="@(None -> WithMetadataValue('Filename', '$(PackageReadmeFilename)'))" />
309+
<_ExistingIcon Include="@(None -> WithMetadataValue('Filename', '$(PackageIconFilename)'))" />
310+
<_ExistingIcon Include="@(Content -> WithMetadataValue('Filename', '$(PackageIconFilename)'))" Condition="'@(_ExistingIcon)' == ''" />
311+
<_ExistingIcon Include="$(MSBuildProjectDirectory)\$(PackageIconFilename)$(PackageIconExtension)" Condition="'@(_ExistingIcon)' == '' and Exists('$(MSBuildProjectDirectory)\$(PackageIconFilename)$(PackageIconExtension)')" />
310312

311-
<_ExistingReadme Include="@(None -> WithMetadataValue('Filename', '$(PackageReadmeFilename)'))" />
312-
<_ExistingReadme Include="@(Content -> WithMetadataValue('Filename', '$(PackageReadmeFilename)'))" Condition="'@(_ExistingReadme)' == ''" />
313-
<_ExistingReadme Include="$(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)" Condition="'@(_ExistingReadme)' == '' and Exists('$(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)')" />
314-
315-
<InferenceCandidate Include="@(_ExistingReadme)"
313+
<InferenceCandidate Include="@(_ExistingIcon -> Distinct())"
316314
PackagePath="%(Filename)%(Extension)"
317-
Condition="'%(Extension)' == '$(PackageReadmeExtension)'" />
315+
Condition="'%(Extension)' == '$(PackageIconExtension)'" />
318316
</ItemGroup>
319317

320318
<ItemGroup>

0 commit comments

Comments
 (0)