merge: icon packaging fix

ChatTwo/ChatTwo.csproj

@@ -57,17 +57,16 @@
     </ItemGroup>
 
 
+    <!-- Plugin icon. Copy images/* into the build output so Dalamud
+         finds the icon next to the DLL, and let the SDK default
+         DalamudPackager pipeline include the same path in the
+         release ZIP. Earlier we shipped a custom DalamudPackager
+         targets override that explicitly set HandleImages and
+         ImagesPath; that override conflicted with the SDK 15
+         default and the resulting manifest carried no IconUrl.
+         Removed in v0.5.2. -->
     <ItemGroup>
-      <Folder Include="images\" />
+        <None Include="images\**">
-    </ItemGroup>
-
-    <!-- Copy images/icon.png next to the built DLL so Dalamud's local
-         plugin loader finds it at <plugindir>/images/icon.png. The
-         DalamudPackager.targets file in this directory then includes
-         the same path inside the release ZIP — see that file for the
-         full packaging override. -->
-    <ItemGroup>
-        <None Include="images\icon.png">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>

ChatTwo/DalamudPackager.targets

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  HellionChat — DalamudPackager override.
-
-  The default DalamudPackager.targets shipped by the SDK does not set
-  HandleImages / ImagesPath, so the images/ directory is silently
-  excluded from the release ZIP. The presence of this file at
-  $(ProjectDir)DalamudPackager.targets disables the SDK's default
-  target (it guards on `!Exists('$(PackagerTargetFile)')`) and lets
-  us call the packager task ourselves with the image fields wired in.
-
-  Apart from HandleImages + ImagesPath the property list mirrors the
-  SDK default verbatim so we don't lose any other manifest field as
-  the upstream SDK evolves.
--->
-<Project>
-    <Target Name="HellionDalamudPackagerDebug"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Debug'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="false"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-
-    <Target Name="HellionDalamudPackagerRelease"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Release'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="true"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-</Project>

ChatTwo/HellionChat.yaml

@@ -33,6 +33,10 @@ description: |-
   Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
 repo_url: https://github.com/JonKazama-Hellion/HellionChat
 accepts_feedback: true
+icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/icon.png
+image_urls:
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/chatWindow.png
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/withSimpleTweaks.png
 tags:
   - Social
   - UI