Fixed the nuget package icon not being bound

ByronMayne · May 13, 2024 · f8a5865 · f8a5865
1 parent b5d7131
commit f8a5865
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,6 +6,12 @@
     <RootNamespace>SGF</RootNamespace>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <SGFSourceDir>$(MSBuildThisFileDirectory)</SGFSourceDir>
+    <ImgDir>$(MSBuildThisFileDirectory)..\img\</ImgDir>
+    <SGfIco>$(MSBuildThisFileDirectory)..\img\icon.png</SGfIco>
+    <!-- Icons -->
+    <ApplicationIcon>$(MSBuildThisFileDirectory)..\img\icon.ico</ApplicationIcon>
+
+
     <!-- Paths | SGF Core -->
     <SGFProjectDir>$(SGFSourceDir)SourceGenerator.Foundations\</SGFProjectDir>
     <SGFProjectPath>$(SGFProjectDir)SourceGenerator.Foundations.csproj</SGFProjectPath>

diff --git a/src/Nuget.Build.props b/src/Nuget.Build.props
@@ -5,7 +5,8 @@
    ===============================-->
   <PropertyGroup>
     <TItle>Source Generator Foundations</TItle>
-    <AUthors>Byron Mayne</AUthors>
+    <Authors>Byron Mayne</Authors>
+    <PackageIcon>SgfIcon.png</PackageIcon>
     <Description>Provides boilerplate code to be used by source generators. Provides the ability to have nuget packages that are resolvable at runtime as well as much better exception handling.</Description>
     <PackageProjectUrl>https://github.dev/ByronMayne/SourceGenerator.Foundations</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -21,6 +22,9 @@
   <!-- Changes the content of the nuget package by manually adding files-->
   <Target Name="AppendNugetContent">
     <ItemGroup>
+      <TfmSpecificPackageFile Include="$(ImgDir)icon.png">
+        <PackagePath>/$(PackageIcon)</PackagePath>
+      </TfmSpecificPackageFile>
       <TfmSpecificPackageFile Include="$(SGFContractsProjectDir)bin\$(Configuration)\netstandard2.0\SourceGenerator.Foundations.Contracts.dll">
         <PackagePath>lib/netstandard2.0/SourceGenerator.Foundations.Contracts.dll</PackagePath>
       </TfmSpecificPackageFile>

diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj
@@ -7,19 +7,13 @@
     <LangVersion>11</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CustomNugetPack</TargetsForTfmSpecificContentInPackage>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
-    <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <None Include="..\..\img\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
     <None Include="..\..\README.md" Pack="True" PackagePath="/" />
     <None Update="SourceGenerator.Foundations.props" Pack="True" PackagePath="build/$(AssemblyName).props" />
     <None Update="SourceGenerator.Foundations.targets" Pack="True" PackagePath="build/$(AssemblyName).targets" />

diff --git a/src/SourceGenerator.Foundations/icon.ico b/src/SourceGenerator.Foundations/icon.ico