Simplify desktop file creation

Author: MattEqualsCoder

.github/workflows/build.yml

@@ -70,8 +70,10 @@ jobs:
         run: |
           pwd
           VERSION="${{ needs.build-windows.outputs.version-number }}"
+          BASE_VERSION="${VERSION%%-*}"
           FILE="MSUScripter/App.axaml.cs"
           sed -i -E "s|^[[:space:]]*private static readonly string\?[[:space:]]+VersionOverride[[:space:]]*=[[:space:]]*null;|private static readonly string? VersionOverride = \"${VERSION}\";|" "$FILE"
+          sed -i "s/^AppVersionRelease *= *.*/AppVersionRelease = ${BASE_VERSION}/" Setup/AppImage.pupnet.conf
           echo "Updated VersionOverride to: ${VERSION}"
       - name: Install PupNet
         run: dotnet tool install -g KuiperZone.PupNet
@@ -81,7 +83,7 @@ jobs:
           chmod +x "$HOME/.local/bin/appimagetool-x86_64.AppImage"
           appimagetool-x86_64.AppImage --version
       - name: Run PupNet
-        run: pupnet Setup/MSUScripter.pupnet.conf --kind appimage -y
+        run: pupnet Setup/AppImage.pupnet.conf --kind appimage -y
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         if: ${{ github.event_name != 'pull_request' }}

MSUScripter/MSUScripter.csproj

@@ -19,7 +19,7 @@
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
         <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.10" />
         <PackageReference Include="K4os.Hash.xxHash" Version="1.0.8" />
-        <PackageReference Include="MattEqualsCoder.AppImageDesktopFileCreator" Version="0.2.0" />
+        <PackageReference Include="MattEqualsCoder.AppImageDesktopFileCreator" Version="0.3.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="1.9.0" />
         <PackageReference Include="MattEqualsCoder.GitHubReleaseChecker" Version="1.1.3" />

MSUScripter/Program.cs

@@ -167,17 +167,7 @@ await Dispatcher.UIThread.Invoke(async () =>
     [SupportedOSPlatform("linux")]
     internal static CreateDesktopFileResponse BuildLinuxDesktopFile()
     {
-        var assembly = Assembly.GetExecutingAssembly();
         return new DesktopFileBuilder("org.mattequalscoder.msuscripter", "MSU Scripter")
-            .AddDescription("UI application for creating MSUs and PCM files")
-            .AddCategory(DesktopFileCategories.Development)
-            .AddWindowClass("MSUScripter")
-            .AddIcon(assembly, "MSUScripter.Assets.icon.16.png", 16)
-            .AddIcon(assembly, "MSUScripter.Assets.icon.32.png", 32)
-            .AddIcon(assembly, "MSUScripter.Assets.icon.48.png", 48)
-            .AddIcon(assembly, "MSUScripter.Assets.icon.256.png", 256)
-            .AddIcon(assembly, "MSUScripter.Assets.icon.512.png", 512)
-            .AddIcon(assembly, "MSUScripter.Assets.icon.svg")
             .AddUninstallAction(Directories.BaseFolder)
             .WithMimeType("application/x-msu-scripter-project", "MSU Scripter Project", "*.msup", true)
             .Build();

Setup/MSUScripter.pupnet.conf Setup/AppImage.pupnet.confSetup/MSUScripter.pupnet.conf renamed to Setup/AppImage.pupnet.conf

@@ -22,10 +22,10 @@ AppId = org.mattequalscoder.msuscripter
 # brackets to denote package release, i.e. '1.2.3[1]'. Release refers to a change to the deployment
 # package, rather the application. If release part is absent (i.e. '1.2.3'), the release value defaults
 # to '1'. Note that the version-release value given here may be overridden from the command line.
-AppVersionRelease = 5.0.0[1]
+AppVersionRelease = 1.0.0
 
 # Mandatory single line application summary text in default (English) language.
-AppShortSummary = MSU Scripter
+AppShortSummary = UI application for creating MSUs and PCM files
 
 # Multi-line (surround with triple """ quotes) application description which provides longer explanation
 # than AppShortSummary in default language. Optional but it is recommended to specify this. Text
@@ -116,7 +116,7 @@ StartCommand = MSUScripter
 # categories, such as: Audio, Development, Game, Office, Utility etc. Only a single value should be
 # provided here which will be used, where supported, to populate metadata. The default is empty.
 # See: https://specifications.freedesktop.org/menu-spec/latest/apa.html
-PrimeCategory = Utility
+PrimeCategory = Development
 
 # Path to AppStream metadata file. It is optional, but recommended as it is used by software centers.
 # Note. The contents of the files may use macro variables. Use 'pupnet --help macro' for reference.
@@ -128,13 +128,14 @@ MetaFile = app.metainfo.xml
 # of a scalable SVG is preferable on Linux, whereas PNGs must be one of the standard sizes and MUST
 # include the size in the filename in the form: name.32x32.png' or 'name.32.png'.
 IconFiles = """
-    ../MSUScripter/Assets/icon.512.png
-    ../MSUScripter/Assets/icon.256.png
-    ../MSUScripter/Assets/icon.128.png
-    ../MSUScripter/Assets/icon.64.png
-    ../MSUScripter/Assets/icon.32.png
-    ../MSUScripter/Assets/icon.24.png
-    ../MSUScripter/Assets/icon.16.png
+    Icons/icon.512.png
+    Icons/icon.256.png
+    Icons/icon.128.png
+    Icons/icon.64.png
+    Icons/icon.32.png
+    Icons/icon.24.png
+    Icons/icon.16.png
+    Icons/icon.svg
 """
 
 ########################################