@@ -290,7 +290,7 @@ Copyright (c) .NET Foundation. All rights reserved.
290
290
<_ExistingReadme Include =" @(Content -> WithMetadataValue('Filename', '$(PackageReadmeFilename)'))" Condition =" '@(_ExistingReadme)' == ''" />
291
291
<_ExistingReadme Include =" $(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)" Condition =" '@(_ExistingReadme)' == '' and Exists('$(MSBuildProjectDirectory)\$(PackageReadmeFilename)$(PackageReadmeExtension)')" />
292
292
293
- <InferenceCandidate Include =" @(_ExistingReadme)"
293
+ <InferenceCandidate Include =" @(_ExistingReadme -> Distinct() )"
294
294
PackagePath =" %(Filename)%(Extension)"
295
295
Condition =" '%(Extension)' == '$(PackageReadmeExtension)'" />
296
296
</ItemGroup >
@@ -306,15 +306,13 @@ Copyright (c) .NET Foundation. All rights reserved.
306
306
307
307
<!-- Even if all these conditions are false, the user can still explicitly pack the icon file, of course -->
308
308
<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)')" />
310
312
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())"
316
314
PackagePath =" %(Filename)%(Extension)"
317
- Condition =" '%(Extension)' == '$(PackageReadmeExtension )'" />
315
+ Condition =" '%(Extension)' == '$(PackageIconExtension )'" />
318
316
</ItemGroup >
319
317
320
318
<ItemGroup >
0 commit comments