From 37a4beaaef9bb39a75400fe4333324fade050bcc Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Fri, 31 May 2024 17:44:57 -0400 Subject: [PATCH 1/2] Move tray app to .NET 4.7.1 for x64 Server 2019 support --- .github/workflows/_meta-publish.yaml | 4 ++-- Jellyfin.Windows.Tray/Jellyfin.Windows.Tray.csproj | 2 +- README.md | 3 ++- nsis/jellyfin.nsi | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_meta-publish.yaml b/.github/workflows/_meta-publish.yaml index df0f5c9..6a81a00 100644 --- a/.github/workflows/_meta-publish.yaml +++ b/.github/workflows/_meta-publish.yaml @@ -28,7 +28,7 @@ jobs: Invoke-WebRequest '${{ inputs.server_url }}' -OutFile 'jellyfin.zip' Expand-Archive 'jellyfin.zip' Copy-Item ".\Support Files\LICENSE" -Destination $(Resolve-Path .\jellyfin\jellyfin) - + - name: Add NSSM run: | Invoke-WebRequest 'https://repo.jellyfin.org/releases/other/nssm.zip' -OutFile 'nssm.zip' @@ -36,7 +36,7 @@ jobs: Copy-Item ".\nssm\nssm.exe" -Destination $(Resolve-Path .\jellyfin\jellyfin) - name: Publish Tray - run: dotnet publish -c Release -r win-x64 --no-self-contained --output $(Resolve-Path .\jellyfin\jellyfin) + run: dotnet publish -c Release -r win-x64 -f net472 --no-self-contained --output $(Resolve-Path .\jellyfin\jellyfin-windows-tray) - name: Build installer run: | diff --git a/Jellyfin.Windows.Tray/Jellyfin.Windows.Tray.csproj b/Jellyfin.Windows.Tray/Jellyfin.Windows.Tray.csproj index a638b66..f361840 100644 --- a/Jellyfin.Windows.Tray/Jellyfin.Windows.Tray.csproj +++ b/Jellyfin.Windows.Tray/Jellyfin.Windows.Tray.csproj @@ -2,7 +2,7 @@ WinExe - net481 + net472 true win-x64 JellyfinIcon.ico diff --git a/README.md b/README.md index 7558cc4..1f524f7 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,9 @@ Do you want to build Jellyfin's tray app or installer for yourself? Read on! ### Steps 1. Build using the dotnet command, or using Visual Studio/VS Code. - * On the command line, in the root of the cloned repository, execute this command: `dotnet build -c Release` + * On the command line, in the root of the cloned repository, execute this command: `dotnet build -c Release -f net472` 2. From the resulting bin folder, collect `Jellyfin.Windows.Tray.exe` and all the DLLs within. +3. For use with a Jellyfin install, place in its own directory, such as `jellyfin-windows-tray`. ### Usage The tray app is designed to do three things: diff --git a/nsis/jellyfin.nsi b/nsis/jellyfin.nsi index 3779bd4..6142641 100644 --- a/nsis/jellyfin.nsi +++ b/nsis/jellyfin.nsi @@ -277,9 +277,9 @@ Section "Create Shortcuts" CreateWinShortcuts ${If} $_MAKESHORTCUTS_ == "Yes" CreateDirectory "$SMPROGRAMS\Jellyfin Server" CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMAXIMIZED - CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\Jellyfin.Windows.Tray.exe" "" "$INSTDIR\icon.ico" 0 + CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-windows-tray\Jellyfin.Windows.Tray.exe" "" "$INSTDIR\icon.ico" 0 ;CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMINIMIZED - CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\Jellyfin.Windows.Tray.exe" "" "$INSTDIR\icon.ico" 0 + CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin-windows-tray\Jellyfin.Windows.Tray.exe" "" "$INSTDIR\icon.ico" 0 ${EndIf} SectionEnd From 47c17c7f08890e9550a77899772aa473ed60c109 Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Sat, 1 Jun 2024 21:24:51 -0400 Subject: [PATCH 2/2] Update pathing for windows-tray build --- .github/workflows/_meta-publish.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_meta-publish.yaml b/.github/workflows/_meta-publish.yaml index 6a81a00..b29ae0e 100644 --- a/.github/workflows/_meta-publish.yaml +++ b/.github/workflows/_meta-publish.yaml @@ -36,7 +36,9 @@ jobs: Copy-Item ".\nssm\nssm.exe" -Destination $(Resolve-Path .\jellyfin\jellyfin) - name: Publish Tray - run: dotnet publish -c Release -r win-x64 -f net472 --no-self-contained --output $(Resolve-Path .\jellyfin\jellyfin-windows-tray) + run: | + New-Item -Path .\jellyfin\jellyfin\jellyfin-windows-tray -ItemType Directory + dotnet publish -c Release -r win-x64 -f net472 --no-self-contained --output $(Resolve-Path .\jellyfin\jellyfin\jellyfin-windows-tray) - name: Build installer run: |