Use same icon for all binaries; fix #25 (#26)

Author: MP3Martin

server/.run/Publish GameInv-WPF.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish GameInv-WPF" type="DotNetFolderPublish" factoryName="Publish to folder">
-    <riderPublish configuration="Release" delete_existing_files="true" include_all_content_for_self_extract="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/GameInv-WPF/bin/Release/net9.0/win-x64/publish" target_framework="net9.0-windows" uuid_high="-1248814020808521624" uuid_low="-4842757618690330912" />
+    <riderPublish configuration="Release" delete_existing_files="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" ready_to_run="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/GameInv-WPF/bin/Release/net9.0/win-x64/publish" target_framework="net9.0-windows" uuid_high="-1248814020808521624" uuid_low="-4842757618690330912" />
     <method v="2" />
   </configuration>
 </component>

server/.run/Publish GameInv.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish GameInv" type="DotNetFolderPublish" factoryName="Publish to folder">
-    <riderPublish configuration="Release" delete_existing_files="true" include_all_content_for_self_extract="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/bin/Release/net9.0/win-x64/publish" target_framework="net9.0" trim_unused_assemblies="true" uuid_high="-6544252972830602690" uuid_low="-8149852761577840996" />
+    <riderPublish configuration="Release" delete_existing_files="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/bin/Release/net9.0/win-x64/publish" target_framework="net9.0" trim_unused_assemblies="true" uuid_high="-6544252972830602690" uuid_low="-8149852761577840996" />
     <method v="2" />
   </configuration>
 </component>

server/GameInv-WPF/GameInv-WPF.csproj

@@ -7,7 +7,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <UseWPF>true</UseWPF>
-        <ApplicationIcon>Resources\favicon.ico</ApplicationIcon>
+        <ApplicationIcon>..\GameInv\Resources\favicon.ico</ApplicationIcon>
         <SelfContained>true</SelfContained>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
     </PropertyGroup>
@@ -28,11 +28,6 @@
         <None Remove="NLog.config"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <Resource Include="Resources\favicon.ico">
-        </Resource>
-    </ItemGroup>
-
     <ItemGroup>
         <Page Update="WPF\Dialogs\ItemEditDialog.xaml">
             <Generator>MSBuild:Compile</Generator>
@@ -69,4 +64,8 @@
     <ItemGroup>
         <ProjectReference Include="..\GameInv\GameInv.csproj"/>
     </ItemGroup>
+
+    <ItemGroup>
+        <Resource Include="..\GameInv\Resources\**\*" Link="Resources\%(RecursiveDir)%(Filename)%(Extension)"/>
+    </ItemGroup>
 </Project>

server/GameInv-WPF/Properties/PublishProfiles/FolderProfile-Windows.pubxml

@@ -12,6 +12,6 @@
         <SelfContained>true</SelfContained>
         <PublishSingleFile>true</PublishSingleFile>
         <PublishReadyToRun>true</PublishReadyToRun>
-        <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     </PropertyGroup>
 </Project>

server/GameInv-WPF/Windows/MainWindow/MainWindow.xaml

@@ -1,4 +1,5 @@
-<Window x:Class="GameInv_WPF.Windows.MainWindow.MainWindow"
+<!-- ReSharper disable once Xaml.PathError -->
+<Window x:Class="GameInv_WPF.Windows.MainWindow.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

server/GameInv/GameInv.csproj

@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <SelfContained>true</SelfContained>
+        <ApplicationIcon>Resources\favicon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
@@ -27,5 +28,4 @@
     <ItemGroup>
         <None Remove="NLog.config"/>
     </ItemGroup>
-
 </Project>

server/GameInv/Properties/PublishProfiles/FolderProfile-Linux.pubxml

@@ -14,5 +14,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
         <SelfContained>true</SelfContained>
         <PublishSingleFile>true</PublishSingleFile>
         <PublishTrimmed>true</PublishTrimmed>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     </PropertyGroup>
 </Project>

server/GameInv/Properties/PublishProfiles/FolderProfile-Windows.pubxml

@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <SelfContained>true</SelfContained>
         <PublishSingleFile>true</PublishSingleFile>
-        <PublishReadyToRun>false</PublishReadyToRun>
         <PublishTrimmed>true</PublishTrimmed>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     </PropertyGroup>
 </Project>