From 0efab2cfb69d762cf13ca5b602f93d2cccceaf5b Mon Sep 17 00:00:00 2001 From: Wendell Jones Date: Sun, 22 Feb 2026 16:43:14 -0500 Subject: [PATCH] Add JELLYFIN_WEB_DIR env and update publish settings - Add JELLYFIN_WEB_DIR environment variable to launch profiles and test project for consistent web directory configuration. - Conditionally add AssemblyMetadata for ASPNETCORE_ENVIRONMENT and JELLYFIN_WEB_DIR in DEBUG builds. - Update FolderProfile.pubxml to delete existing files on publish and set additional properties (TargetFramework, ProjectGuid, etc.). - Bump Jellyfin.CodeAnalysis assembly version and update related binaries. - Refresh publish history in FolderProfile.pubxml.user. --- Jellyfin.Server/Properties/AssemblyInfo.cs | 5 +++++ .../PublishProfiles/FolderProfile.pubxml | 6 +++++- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../Properties/launchSettings.json | 9 ++++++--- .../netstandard2.0/Jellyfin.CodeAnalysis.dll | Bin 8704 -> 8704 bytes .../netstandard2.0/Jellyfin.CodeAnalysis.pdb | Bin 10220 -> 10220 bytes .../Jellyfin.CodeAnalysis.AssemblyInfo.cs | 2 +- ...yfin.CodeAnalysis.AssemblyInfoInputs.cache | 2 +- .../netstandard2.0/Jellyfin.CodeAnalysis.dll | Bin 8704 -> 8704 bytes .../netstandard2.0/Jellyfin.CodeAnalysis.pdb | Bin 10220 -> 10220 bytes ...llyfin.Server.Implementations.Tests.csproj | 4 ++++ 11 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Jellyfin.Server/Properties/AssemblyInfo.cs b/Jellyfin.Server/Properties/AssemblyInfo.cs index 652b75b2..ac58c788 100644 --- a/Jellyfin.Server/Properties/AssemblyInfo.cs +++ b/Jellyfin.Server/Properties/AssemblyInfo.cs @@ -26,3 +26,8 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: InternalsVisibleTo("Jellyfin.Server.Tests")] + +#if DEBUG +[assembly: AssemblyMetadata("ASPNETCORE_ENVIRONMENT", "Development")] +[assembly: AssemblyMetadata("JELLYFIN_WEB_DIR", "path/to/your/web/directory")] +#endif diff --git a/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml b/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml index a80b94cf..0af0ba16 100644 --- a/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml @@ -2,7 +2,7 @@ - false + true false true Release @@ -11,5 +11,9 @@ E:\Program Files\Jellyfin FileSystem <_TargetId>Folder + + net11.0 + 07e39f42-a2c6-4b32-af8c-725f957a73ff + false \ No newline at end of file diff --git a/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml.user b/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml.user index 7ac58fcd..f01eeb6b 100644 --- a/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Jellyfin.Server/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -3,7 +3,7 @@ <_PublishTargetUrl>E:\Program Files\Jellyfin - True|2026-02-22T21:05:05.3412117Z||;True|2026-02-22T15:59:39.7645693-05:00||; + True|2026-02-22T21:29:37.5643134Z||;True|2026-02-22T16:05:05.3412117-05:00||;True|2026-02-22T15:59:39.7645693-05:00||; \ No newline at end of file diff --git a/Jellyfin.Server/Properties/launchSettings.json b/Jellyfin.Server/Properties/launchSettings.json index 20d432af..a3e6827d 100644 --- a/Jellyfin.Server/Properties/launchSettings.json +++ b/Jellyfin.Server/Properties/launchSettings.json @@ -5,13 +5,15 @@ "launchBrowser": true, "applicationUrl": "http://localhost:8096", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "JELLYFIN_WEB_DIR": "E:/Projects/jellyfin-web" } }, "Jellyfin.Server (nowebclient)": { "commandName": "Project", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "JELLYFIN_WEB_DIR": "E:/Projects/jellyfin-web" }, "commandLineArgs": "--nowebclient" }, @@ -21,7 +23,8 @@ "launchUrl": "api-docs/swagger", "applicationUrl": "http://localhost:8096", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development", + "JELLYFIN_WEB_DIR": "E:/Projects/jellyfin-web" }, "commandLineArgs": "--nowebclient" } diff --git a/src/Jellyfin.CodeAnalysis/bin/Debug/netstandard2.0/Jellyfin.CodeAnalysis.dll b/src/Jellyfin.CodeAnalysis/bin/Debug/netstandard2.0/Jellyfin.CodeAnalysis.dll index be5887a1846e6cef9ec51a953a09b1e637391422..2543295c499fd0900e21b1039ba7db8fdaa8c4f6 100644 GIT binary patch delta 235 zcmZp0X>gg)!Q!E0vvFfjjHtk?x#BAxF52k3)%<9+W(~jU<{zSam^9KXlFXCMjM6Mq z4bx1_%`FYhj14SO%#1BfQ<97fjgk`$(~=WS3=JmVkyyiGaM^6uszS!h9lEn&8!S%*aL6GXgm2F#Rnu%3z`kD~8xnAlfi+>t}1w#^pIYTmo z8G{i+8iOT6DuW@AHUWy619^r(abpGppsExw%aXwq$VvjLH3Z^hhD5Mx5N!fv8EjrI HAISs&iEBz= delta 235 zcmZp0X>gg)!BQ?+_-|uRjHm#2Iip?0r$ru9l0GbvZ_Z-c{6lmPlSYbRs##i6vZ0ZY znVE^DL9(S`qD6ADu~CX;nq_K|iE)})vZa|}lKJF25^Gq#&%LvDa*t$yfSdHiJC}Kz zy_QHEm^9^RI^X0slEn&8K`j-iAV_t_=|c6aMDtA@kB*+%TrYK##Xp6?kRg@9j3JF7 zi6I%tHUdI3AT(jHWH11VSOUco87zRTWCmlPTnbPm4Tw{L>P>(mX+X6gRc1hSNet$j Jm&->o0RY}@OO*fs diff --git a/src/Jellyfin.CodeAnalysis/bin/Debug/netstandard2.0/Jellyfin.CodeAnalysis.pdb b/src/Jellyfin.CodeAnalysis/bin/Debug/netstandard2.0/Jellyfin.CodeAnalysis.pdb index c7bc4613f91eaacb897fc95b9d1f9a5aae094012..41ded105a5ae6d4860c0a7b73b46cd4f0a5ea7db 100644 GIT binary patch delta 448 zcmV;x0YCoiPwY>Sd=yF4fcUvCgio^`&frT{-xe^_Hkz@JRs?@ooUG-dScyALB+QW{ z{d+NdCI~{$AEH`PUd$NwPSjF?b~OY50IieXOCvE5$KM72hry>4F}vILTB{<|ilT6E zsOZCS53||Hb|9NbGEw%wmsDAL+z)!t$x|lZeCC@;QWVEKjs3l%fOAaZk6UsSP^h_B zCv!ZmID+;K!5e=@7z9xFfFRymHAwH16YdC}C`9(|bfQW%F2~heO-5x|X5FA&uF$m< zK|DyVVAv9L*n`Ft3D{{L0%?JoR`|+30J;X=*jlIwtd9b02AZts!y`usG?@Ibc3%A9 zY`bpZ{$7ggT6pNAPVVjWkw9+JO>uaWv>Ia9XSDQF-Dd5y#up;25uqWVBpaJ delta 448 zcmV;x0YCoiPwY>Sd=y3-(cIGwgG!_rz><{3XAbwB+^w;YRs??>^Dt{s-40tnU^G6% z<&+3{f=S$Y^Q>#T?*F`sLH(T@r zC6EA8Dp+;|BTis2Cj#~+#7IU!(-wboh=9I_2X+oLfeT51?M#y`J$mE>k!F*R)~>1- z&UWk;o}T2yet^3v35}P3Pt`41M@BgK%Od@ODbc9ibn$;&pw>@on=t-DKdnU~>n!x@ z>8#!KA?^zrj5BLAh q?%wmK{XZL6UjEJ9hs>^r?~#Q{+3SeINM67=Oi7h}e*m+725upOW7~@W diff --git a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfo.cs b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfo.cs index 7c13a0b8..e5aad213 100644 --- a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfo.cs +++ b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Jellyfin.CodeAnalysis")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d1e6fbc12266490c91a8cc32d9f9eb43f6c961b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f8b7c62f9e1f477916308d6395db212ca1fca410")] [assembly: System.Reflection.AssemblyProductAttribute("Jellyfin.CodeAnalysis")] [assembly: System.Reflection.AssemblyTitleAttribute("Jellyfin.CodeAnalysis")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfoInputs.cache b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfoInputs.cache index d83300e7..767c34df 100644 --- a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfoInputs.cache +++ b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.AssemblyInfoInputs.cache @@ -1 +1 @@ -02669f7b2e5b29053e97c2c10b763f5f61e0ca0906507b64fdb62c6386f0f64f +79af6817c2e15e73182d4e4594eab8c486fd3066d87d7dd560325ec905918c97 diff --git a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.dll b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.dll index be5887a1846e6cef9ec51a953a09b1e637391422..2543295c499fd0900e21b1039ba7db8fdaa8c4f6 100644 GIT binary patch delta 235 zcmZp0X>gg)!Q!E0vvFfjjHtk?x#BAxF52k3)%<9+W(~jU<{zSam^9KXlFXCMjM6Mq z4bx1_%`FYhj14SO%#1BfQ<97fjgk`$(~=WS3=JmVkyyiGaM^6uszS!h9lEn&8!S%*aL6GXgm2F#Rnu%3z`kD~8xnAlfi+>t}1w#^pIYTmo z8G{i+8iOT6DuW@AHUWy619^r(abpGppsExw%aXwq$VvjLH3Z^hhD5Mx5N!fv8EjrI HAISs&iEBz= delta 235 zcmZp0X>gg)!BQ?+_-|uRjHm#2Iip?0r$ru9l0GbvZ_Z-c{6lmPlSYbRs##i6vZ0ZY znVE^DL9(S`qD6ADu~CX;nq_K|iE)})vZa|}lKJF25^Gq#&%LvDa*t$yfSdHiJC}Kz zy_QHEm^9^RI^X0slEn&8K`j-iAV_t_=|c6aMDtA@kB*+%TrYK##Xp6?kRg@9j3JF7 zi6I%tHUdI3AT(jHWH11VSOUco87zRTWCmlPTnbPm4Tw{L>P>(mX+X6gRc1hSNet$j Jm&->o0RY}@OO*fs diff --git a/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.pdb b/src/Jellyfin.CodeAnalysis/obj/Debug/netstandard2.0/Jellyfin.CodeAnalysis.pdb index c7bc4613f91eaacb897fc95b9d1f9a5aae094012..41ded105a5ae6d4860c0a7b73b46cd4f0a5ea7db 100644 GIT binary patch delta 448 zcmV;x0YCoiPwY>Sd=yF4fcUvCgio^`&frT{-xe^_Hkz@JRs?@ooUG-dScyALB+QW{ z{d+NdCI~{$AEH`PUd$NwPSjF?b~OY50IieXOCvE5$KM72hry>4F}vILTB{<|ilT6E zsOZCS53||Hb|9NbGEw%wmsDAL+z)!t$x|lZeCC@;QWVEKjs3l%fOAaZk6UsSP^h_B zCv!ZmID+;K!5e=@7z9xFfFRymHAwH16YdC}C`9(|bfQW%F2~heO-5x|X5FA&uF$m< zK|DyVVAv9L*n`Ft3D{{L0%?JoR`|+30J;X=*jlIwtd9b02AZts!y`usG?@Ibc3%A9 zY`bpZ{$7ggT6pNAPVVjWkw9+JO>uaWv>Ia9XSDQF-Dd5y#up;25uqWVBpaJ delta 448 zcmV;x0YCoiPwY>Sd=y3-(cIGwgG!_rz><{3XAbwB+^w;YRs??>^Dt{s-40tnU^G6% z<&+3{f=S$Y^Q>#T?*F`sLH(T@r zC6EA8Dp+;|BTis2Cj#~+#7IU!(-wboh=9I_2X+oLfeT51?M#y`J$mE>k!F*R)~>1- z&UWk;o}T2yet^3v35}P3Pt`41M@BgK%Od@ODbc9ibn$;&pw>@on=t-DKdnU~>n!x@ z>8#!KA?^zrj5BLAh q?%wmK{XZL6UjEJ9hs>^r?~#Q{+3SeINM67=Oi7h}e*m+725upOW7~@W diff --git a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj index 08b6062b..9defd884 100644 --- a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj +++ b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj @@ -6,6 +6,10 @@ net11.0 + + E:/Projects/jellyfin-web + + PreserveNewest