From ea27f53bce7845e2b5a32499442c0b0bd3090edc Mon Sep 17 00:00:00 2001
From: Shmueli Englard <shmueli.yosef@englard.net>
Date: Mon, 8 Jan 2024 21:12:21 -0800
Subject: [PATCH] Update Packaging configuration and remove ico from binary

---
 Directory.Build.props                                |  2 +-
 src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1e116db..f305f9c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -61,7 +61,7 @@
     <Copyright>Copyright (c) 2022 Shmueli Englard</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageIcon>icon.png</PackageIcon>
+    <PackageIcon>$(MSBuildProjectName)-128.png</PackageIcon>
     <PackageIconUrl>https://github.com/shmuelie/Shmuelie.WinRTServer/blob/main/Shmuelie.WinRTServer-64.png?raw=true</PackageIconUrl>
     <PackageTags>dotnet net netcore netstandard csharp library windows com winrt oop outofprocess rpc</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj b/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj
index 7c664db..c1d9c58 100644
--- a/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj
+++ b/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj
@@ -3,7 +3,6 @@
     <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <TargetFrameworks>netstandard2.0;net8.0-windows$(TargetPlatformVersion)</TargetFrameworks>
-    <ApplicationIcon>..\..\$(MSBuildProjectName).ico</ApplicationIcon>
     <IsPackable>true</IsPackable>
     <PackageReleaseNotes>Added support for modern .NET servers.</PackageReleaseNotes>
     <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
@@ -21,16 +20,13 @@
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(ApplicationIcon)" Pack="false">
-      <Link>$(MSBuildProjectName).ico</Link>
-    </Content>
-    <Content Include="..\..\$(MSBuildProjectName)-128.png" PackFolder="\">
+    <None Include="..\..\$(MSBuildProjectName)-128.png" PackagePath="\" Pack="true">
       <Link>icon.png</Link>
-    </Content>
-    <None Include="../../README.md" PackFolder="\">
+    </None>
+    <None Include="../../README.md" PackagePath="\" Pack="true">
       <Visible>false</Visible>
     </None>
-    <None Include="../../LICENSE" PackFolder="\">
+    <None Include="../../LICENSE" PackagePath="\" Pack="true">
       <Visible>false</Visible>
     </None>
     <None Include="..\..\.editorconfig" Pack="false">