Allow logo.png as a PackageIcon fallback for nugetizer and SDK pack.

Author: Doe Food Programs

src/Directory.Build.props

@@ -25,10 +25,12 @@
  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
- <!-- Pick src-level readme+icon automatically -->
+ <!-- Pick src-level readme+icon automatically (icon.png preferred, logo.png fallback) -->
+ <PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)logo.png')">logo.png</PackageIcon>
  <PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)icon.png')">icon.png</PackageIcon>
  <PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md')">readme.md</PackageReadmeFile>
  <!-- Pick project-level readme+icon overrides automatically -->
+ <PackageIcon Condition="Exists('$(MSBuildProjectDirectory)\logo.png')">logo.png</PackageIcon>
  <PackageIcon Condition="Exists('$(MSBuildProjectDirectory)\icon.png')">icon.png</PackageIcon>
  <PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildProjectDirectory)\readme.md')">readme.md</PackageReadmeFile>
 

src/Directory.Build.targets

@@ -63,18 +63,23 @@
  <None Update="@(None -> WithMetadataValue('Filename', 'icon'))" 
  Pack="true" PackagePath="%(Filename)%(Extension)" 
  CopyToOutputDirectory="Never"
- Condition="'$(PackageIcon)' != ''" />
+ Condition="'$(PackageIcon)' == 'icon.png'" />
+
+ <None Update="@(None -> WithMetadataValue('Filename', 'logo'))" 
+ Pack="true" PackagePath="%(Filename)%(Extension)" 
+ CopyToOutputDirectory="Never"
+ Condition="'$(PackageIcon)' == 'logo.png'" />
 
  <None Update="@(None -> WithMetadataValue('Filename', 'readme'))" 
  Pack="true" PackagePath="%(Filename)%(Extension)" 
  CopyToOutputDirectory="Never"
  Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
 
  <!-- src-level will need explicit inclusion -->
- <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" 
- Pack="true" PackagePath="%(Filename)%(Extension)"
+ <None Include="$(MSBuildThisFileDirectory)$(PackageIcon)" Link="$(PackageIcon)" Visible="false" 
+ Pack="true" PackagePath="$(PackageIcon)"
  CopyToOutputDirectory="Never"
- Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
+ Condition="'$(PackageIcon)' != '' and Exists('$(MSBuildThisFileDirectory)$(PackageIcon)') and !Exists('$(MSBuildProjectDirectory)\$(PackageIcon)')" />
 
  <None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md" 
  Pack="true" PackagePath="%(Filename)%(Extension)"