Add PackageIcon to fix warning/errors in build

MrSmoke · MrSmoke · commit 96f3fc9ae937 · 2025-04-18T14:05:39.000+10:00
diff --git a/.editorconfig b/.editorconfig
@@ -246,7 +246,8 @@ dotnet_diagnostic.IDE0059.severity = warning
 # IDE0161: Convert to file-scoped namespace
 dotnet_diagnostic.IDE0161.severity = warning
 
-[*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
 indent_size = 2
 
 [*.json]
diff --git a/ClickView.GoodStuff.sln b/ClickView.GoodStuff.sln
@@ -50,6 +50,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solutio
 		Directory.Build.props = Directory.Build.props
 		.editorconfig = .editorconfig
 		.github\dependabot.yml = .github\dependabot.yml
+		Directory.Build.targets = Directory.Build.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Id Generators", "Id Generators", "{9478C56E-C226-4DD9-AC2E-0A4E9085414D}"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,7 @@
     <Authors>ClickView</Authors>
     <PackageProjectUrl>https://github.com/clickviewapp/GoodStuff</PackageProjectUrl>
     <PackageIconUrl>https://static.clickview.com.au/assets/images/nugetlogo-64x64.png</PackageIconUrl>
+    <PackageIcon>package-icon.png</PackageIcon>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -14,6 +15,10 @@
     <Version>1.9.0-rc1</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
+  </ItemGroup>
+
   <PropertyGroup>
     <LangVersion>13.0</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup Condition="'$(IsPackable)' == 'true'">
+    <None Include="$(MSBuildThisFileDirectory)\assets\package-icon.png" Pack="true" PackagePath="\" Visible="false" />
+  </ItemGroup>
+</Project>
diff --git a/assets/package-icon.png b/assets/package-icon.png
diff --git a/src/AspNetCore/MaxMind/src/ClickView.GoodStuff.AspNetCore.MaxMind.csproj b/src/AspNetCore/MaxMind/src/ClickView.GoodStuff.AspNetCore.MaxMind.csproj
@@ -16,7 +16,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <InternalsVisibleTo Include="$(AssemblyName).Tests" />
       <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     </ItemGroup>
 
diff --git a/src/IdGenerators/IdGen/src/ClickView.GoodStuff.IdGenerators.IdGen.csproj b/src/IdGenerators/IdGen/src/ClickView.GoodStuff.IdGenerators.IdGen.csproj
@@ -14,8 +14,4 @@
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
     </ItemGroup>
 
-    <ItemGroup>
-        <InternalsVisibleTo Include="$(AssemblyName).Tests" />
-    </ItemGroup>
-
 </Project>
