From 553ea69d937bae2628ed673467046f1cef87cc1c Mon Sep 17 00:00:00 2001 From: erri120 Date: Wed, 26 Jun 2024 12:24:34 +0200 Subject: [PATCH 1/4] Add icons --- src/NexusMods.App/{nexus-logo.ico => icon.ico} | Bin src/NexusMods.App/icon.svg | 12 ++++++++++++ 2 files changed, 12 insertions(+) rename src/NexusMods.App/{nexus-logo.ico => icon.ico} (100%) create mode 100644 src/NexusMods.App/icon.svg diff --git a/src/NexusMods.App/nexus-logo.ico b/src/NexusMods.App/icon.ico similarity index 100% rename from src/NexusMods.App/nexus-logo.ico rename to src/NexusMods.App/icon.ico diff --git a/src/NexusMods.App/icon.svg b/src/NexusMods.App/icon.svg new file mode 100644 index 0000000000..95c68dec14 --- /dev/null +++ b/src/NexusMods.App/icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + From ea2ba4470b75ce26fcf7c4f7bad576fa72077a68 Mon Sep 17 00:00:00 2001 From: erri120 Date: Wed, 26 Jun 2024 12:24:50 +0200 Subject: [PATCH 2/4] Update pupnet --- src/NexusMods.App/NexusMods.App.csproj | 28 +++++++++-- src/NexusMods.App/app.manifest | 14 ++++-- src/NexusMods.App/app.pupnet.conf | 47 ++----------------- ...{app.desktop => com.nexusmods.app.desktop} | 0 ...nfo.xml => com.nexusmods.app.metainfo.xml} | 0 5 files changed, 39 insertions(+), 50 deletions(-) rename src/NexusMods.App/{app.desktop => com.nexusmods.app.desktop} (100%) rename src/NexusMods.App/{app.metainfo.xml => com.nexusmods.app.metainfo.xml} (100%) diff --git a/src/NexusMods.App/NexusMods.App.csproj b/src/NexusMods.App/NexusMods.App.csproj index d59e1bcd8e..1253585d42 100644 --- a/src/NexusMods.App/NexusMods.App.csproj +++ b/src/NexusMods.App/NexusMods.App.csproj @@ -1,9 +1,10 @@ WinExe - nexus-logo.ico + icon.ico app.manifest + @@ -55,9 +56,28 @@ - - Always - + + Always + app.pupnet.conf + + + app.pupnet.conf + + + app.pupnet.conf + + + app.pupnet.conf + + + app.pupnet.conf + + + app.pupnet.conf + + + app.pupnet.conf + - + - + + + + + amd64 + + @@ -11,7 +17,7 @@ and is designed to work with. Uncomment the appropriate elements and Windows will automatically select the most compatible environment. --> - + diff --git a/src/NexusMods.App/app.pupnet.conf b/src/NexusMods.App/app.pupnet.conf index eaebd8da68..e31afaee84 100644 --- a/src/NexusMods.App/app.pupnet.conf +++ b/src/NexusMods.App/app.pupnet.conf @@ -18,7 +18,7 @@ AppChangeFile = # PUBLISHER PublisherName = Nexus Mods -PublisherCopyright = Copyright (C) Nexus Mods 2023 +PublisherCopyright = Copyright (C) Nexus Mods 2024 PublisherLinkName = Home Page PublisherLinkUrl = https://nexusmods.com PublisherEmail = @@ -26,12 +26,11 @@ PublisherEmail = # DESKTOP INTEGRATION DesktopNoDisplay = false DesktopTerminal = false -DesktopFile = app.desktop -StartCommand = -PrimeCategory = -MetaFile = app.metainfo.xml +DesktopFile = com.nexusmods.app.desktop +MetaFile = com.nexusmods.app.metainfo.xml IconFiles = """ - nexus-logo.ico + icon.ico + icon.svg """ # DOTNET PUBLISH @@ -48,46 +47,10 @@ OutputDirectory = Deploy/OUT AppImageArgs = AppImageVersionOutput = false -# FLATPAK OPTIONS -FlatpakPlatformRuntime = org.freedesktop.Platform -FlatpakPlatformSdk = org.freedesktop.Sdk -FlatpakPlatformVersion = 22.08 -FlatpakFinishArgs = """ - --socket=wayland - --socket=x11 - --filesystem=host - --share=network -""" -FlatpakBuilderArgs = - -# RPM OPTIONS -RpmAutoReq = false -RpmAutoProv = true -RpmRequires = """ - krb5-libs - libicu - openssl-libs - zlib -""" - -# DEBIAN OPTIONS -DebianRecommends = """ - libc6 - libgcc1 - libgcc-s1 - libgssapi-krb5-2 - libicu - libssl - libstdc++6 - libunwind - zlib1g -""" - # WINDOWS SETUP OPTIONS SetupAdminInstall = false SetupCommandPrompt = SetupMinWindowsVersion = 10 -# TODO: signing SetupSignTool = SetupSuffixOutput = SetupVersionOutput = false diff --git a/src/NexusMods.App/app.desktop b/src/NexusMods.App/com.nexusmods.app.desktop similarity index 100% rename from src/NexusMods.App/app.desktop rename to src/NexusMods.App/com.nexusmods.app.desktop diff --git a/src/NexusMods.App/app.metainfo.xml b/src/NexusMods.App/com.nexusmods.app.metainfo.xml similarity index 100% rename from src/NexusMods.App/app.metainfo.xml rename to src/NexusMods.App/com.nexusmods.app.metainfo.xml From 8c75d21e826a86c1b4fd9b56e47be9c26ab001e0 Mon Sep 17 00:00:00 2001 From: erri120 Date: Wed, 26 Jun 2024 13:02:27 +0200 Subject: [PATCH 3/4] Update desktop and metainfo files --- src/NexusMods.App/com.nexusmods.app.desktop | 22 +++--- .../com.nexusmods.app.metainfo.xml | 74 +++++++++---------- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/src/NexusMods.App/com.nexusmods.app.desktop b/src/NexusMods.App/com.nexusmods.app.desktop index 0da8675ce8..96ab019493 100644 --- a/src/NexusMods.App/com.nexusmods.app.desktop +++ b/src/NexusMods.App/com.nexusmods.app.desktop @@ -1,13 +1,15 @@ [Desktop Entry] Type=Application -Name=${APP_FRIENDLY_NAME} -Icon=${APP_ID} -Comment=${APP_SHORT_SUMMARY} -Exec=${INSTALL_EXEC} +Version=1.2 +Name=Nexus Mods App +GenericName=Mod Manager +Comment=Mod Manager for your games +Categories=Game +Terminal=false +MimeType=x-scheme-handler/nxm +Icon=com.nexusmods.app +Exec=${INSTALL_EXEC} %u TryExec=${INSTALL_EXEC} -NoDisplay=${DESKTOP_NODISPLAY} -X-AppImage-Integrate=${DESKTOP_INTEGRATE} -Terminal=${DESKTOP_TERMINAL} -Categories=${PRIME_CATEGORY} -MimeType= -Keywords= \ No newline at end of file +X-AppImage-Integrate=true +X-AppImage-Name=NexusMods.App +X-AppImage-Arch=x86_64 diff --git a/src/NexusMods.App/com.nexusmods.app.metainfo.xml b/src/NexusMods.App/com.nexusmods.app.metainfo.xml index 4435bab5cf..f5d7e8ef56 100644 --- a/src/NexusMods.App/com.nexusmods.app.metainfo.xml +++ b/src/NexusMods.App/com.nexusmods.app.metainfo.xml @@ -2,50 +2,50 @@ - - MIT + com.nexusmods.app + CC0-1.0 + GPL-3.0-only - - ${APP_ID} - ${APP_FRIENDLY_NAME} - ${APP_SHORT_SUMMARY} - ${PUBLISHER_NAME} - ${PUBLISHER_LINK_URL} - ${APP_LICENSE_ID} - - - ${APP_ID}.desktop + Nexus Mods App + Mod Manager for your games - ${APPSTREAM_DESCRIPTION_XML} +

The Nexus Mods App is a mod manager for your games.

 - + com.nexusmods.app.desktop + + https://github.com/Nexus-Mods/NexusMods.App + https://github.com/Nexus-Mods/NexusMods.App/issues + https://nexus-mods.github.io/NexusMods.App/users/FAQ/ + https://nexus-mods.github.io/NexusMods.App/users + https://nexus-mods.github.io/NexusMods.App/developers/Contributing/ + https://discord.gg/ReWTxb93jS + https://github.com/Nexus-Mods/NexusMods.App + https://nexus-mods.github.io/NexusMods.App/developers/Contributing/ + + Nexus mods + + moderate + + - ${PRIME_CATEGORY} + Game - - - - - - - ${APPSTREAM_CHANGELOG_XML} - + + 1024 + + always + 360 + + + + com.valvesoftware.Steam + + + + com.usebottles.bottles + From e8be7f83d738d84f563643c6d1df3bccb39dffce Mon Sep 17 00:00:00 2001 From: erri120 Date: Wed, 26 Jun 2024 13:09:51 +0200 Subject: [PATCH 4/4] Fix validation issues --- src/NexusMods.App/.gitignore | 1 + src/NexusMods.App/app.pupnet.conf | 11 +++++++++++ src/NexusMods.App/com.nexusmods.app.desktop | 2 +- src/NexusMods.App/com.nexusmods.app.metainfo.xml | 9 +++++---- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 src/NexusMods.App/.gitignore diff --git a/src/NexusMods.App/.gitignore b/src/NexusMods.App/.gitignore new file mode 100644 index 0000000000..c9e642adbe --- /dev/null +++ b/src/NexusMods.App/.gitignore @@ -0,0 +1 @@ +Deploy/ diff --git a/src/NexusMods.App/app.pupnet.conf b/src/NexusMods.App/app.pupnet.conf index e31afaee84..bf391f925d 100644 --- a/src/NexusMods.App/app.pupnet.conf +++ b/src/NexusMods.App/app.pupnet.conf @@ -55,3 +55,14 @@ SetupSignTool = SetupSuffixOutput = SetupVersionOutput = false SetupUninstallScript = "uninstall.bat" + + + + + + + +# unused but required +FlatpakPlatformRuntime = org.freedesktop.Platform +FlatpakPlatformSdk = org.freedesktop.Sdk +FlatpakPlatformVersion = 23.08 diff --git a/src/NexusMods.App/com.nexusmods.app.desktop b/src/NexusMods.App/com.nexusmods.app.desktop index 96ab019493..1f6b16e9f5 100644 --- a/src/NexusMods.App/com.nexusmods.app.desktop +++ b/src/NexusMods.App/com.nexusmods.app.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.2 +Version=1.0 Name=Nexus Mods App GenericName=Mod Manager Comment=Mod Manager for your games diff --git a/src/NexusMods.App/com.nexusmods.app.metainfo.xml b/src/NexusMods.App/com.nexusmods.app.metainfo.xml index f5d7e8ef56..2c7b50e48e 100644 --- a/src/NexusMods.App/com.nexusmods.app.metainfo.xml +++ b/src/NexusMods.App/com.nexusmods.app.metainfo.xml @@ -9,8 +9,12 @@ Nexus Mods App Mod Manager for your games + + The Nexus Mods Team + + -

The Nexus Mods App is a mod manager for your games.

+

The Nexus Mods App is a mod manager for your games and the successor to Vortex with native support for Linux.

 com.nexusmods.app.desktop @@ -24,7 +28,6 @@ https://github.com/Nexus-Mods/NexusMods.App https://nexus-mods.github.io/NexusMods.App/developers/Contributing/ - Nexus mods moderate @@ -38,9 +41,7 @@ always 360 - - com.valvesoftware.Steam