From a340f5297326ea7ad7092b172ea915f2cb8397a3 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 19 Aug 2025 12:10:15 -0400 Subject: [PATCH] add project reference in AppHost to Server so that dependencies will be automatically copied --- .../AppHost/Oqtane.Application.AppHost.csproj | 4 +++ .../Build/Oqtane.Application.nuspec | 32 ------------------ Oqtane.Application/Build/debug.cmd | 10 ------ Oqtane.Application/Build/debug.sh | 11 ------ Oqtane.Application/Build/icon.png | Bin 4895 -> 0 bytes Oqtane.Application/Build/release.cmd | 2 -- Oqtane.Application/Build/release.sh | 1 - 7 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 Oqtane.Application/Build/Oqtane.Application.nuspec delete mode 100644 Oqtane.Application/Build/icon.png delete mode 100644 Oqtane.Application/Build/release.cmd delete mode 100644 Oqtane.Application/Build/release.sh diff --git a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj index 8f04d329..9490f607 100644 --- a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj +++ b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj @@ -44,4 +44,8 @@ + + + + diff --git a/Oqtane.Application/Build/Oqtane.Application.nuspec b/Oqtane.Application/Build/Oqtane.Application.nuspec deleted file mode 100644 index 1cca2e51..00000000 --- a/Oqtane.Application/Build/Oqtane.Application.nuspec +++ /dev/null @@ -1,32 +0,0 @@ - - - - $projectname$ - 1.0.0 - Oqtane.Application - Oqtane.Application - Oqtane.Application - Oqtane.Application - Oqtane.Application - false - MIT - https://github.com/oqtane/oqtane.framework - icon.png - oqtane module - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Oqtane.Application/Build/debug.cmd b/Oqtane.Application/Build/debug.cmd index 6ac5c190..697dd3ae 100644 --- a/Oqtane.Application/Build/debug.cmd +++ b/Oqtane.Application/Build/debug.cmd @@ -1,11 +1 @@ -@echo off -set TargetFramework=%1 -set ProjectName=%2 - -XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I \ No newline at end of file diff --git a/Oqtane.Application/Build/debug.sh b/Oqtane.Application/Build/debug.sh index 7c4beb97..bf088d67 100644 --- a/Oqtane.Application/Build/debug.sh +++ b/Oqtane.Application/Build/debug.sh @@ -1,12 +1 @@ -#!/bin/bash - -TargetFramework=$1 -ProjectName=$2 - -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/" -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/" -cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/" -cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/" -cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/" -cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/" cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/" \ No newline at end of file diff --git a/Oqtane.Application/Build/icon.png b/Oqtane.Application/Build/icon.png deleted file mode 100644 index 3c43cce4c6604107eab529207edd44c386768ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4895 zcmV+)6X5KLP)Px#1ZP1_K>z@;j|==^1poj7B2Y|JMgRZ*{{H^`{r&v>{G+3zeSLkLoSa!%Sq26M z0|NsE1qDh25)y%dfpBneJ3BizHZ}s;WgrMN3Od zg@uKVj*gI!kau@?goK1!TU(u-or#HwuCA^uEG(Own>95xWMpIy4-c%YtT8b$NJvO^ zb#+owQYI!Qva+&FOiV5=E^KUUnVFfWsHl~dm3Vk~X=!OqO-;46wIU)SI5;>nGc&ff zwmv>SnwpxgudgpJFCQNtjg5^zKR>3Xri_e?dU|?OQ&VRaI57v9W-FfP;gB zZ*Omul$4j3m#3$vmX?-lYiqEuuvAo3h=_N?x0*=>;fLtmHDY5rf{_g*zKv)fg} z^!Chl^G)wePuHtg@2mIf>SH!&J(RLL`Ns{ziweNRq_s9qV=8Pt90B{`il-rL7BcnjL= zUz$gcD7CD%g)pYtT3eksqh<0_wpM4;_{P0lPY!`w%n91sUd{9Lu zT*tNVfPO3=Jjlq|brCfJdcBp*HmI_xg*X9M@rj|VgKXSD9j_;}LQ~pkg|iK{$;W~_ zuFW}UBuYJA9x;6%4wH*kvdQ1nd2m^6WitsIEgOs0ULOWTHlrXWG(vQ0e_JPinBo&Q zOE$qSc@iA_O~mN=ET2(exkOa9$imP`g%b3%r)-{#f~K^Et!$|^+5x@IX2>%7{bM13 zQ6$sD2twk~y20cGRCe1dyLeL>UAoJiS#H2x)Am4; zdo8?WF}Rd^#^3AGX7pAo%}~Km7B6A_s#1UQXE;D|FBvbV=lHd@qwg-8J3COl>=2(% z^xQpBEO8SF217H%U$X!*iEVqDFBp1wP-JZt9^#cC*hkXEd#Wlj0J3AhBd|bC=;^%> zjC>Ll4phiVx)b}E;32jhWOHL3!pG^=vxlEsV0pYf%PV_*2>aMFf$6123tVlUE3mbZ z$%ny%yomOm4Ub@iTSpdYJ?y%A1h_}%}NOU9B( zu_U;ihh`la56%!LCbK$3m~)wZtYyq#?NY&t4mQdKBBCoVN*(}=)>TQFiSF!=^zdYKr>v&DdZ`hPPQ3bCI)Hrqdp?k4A#`vxC-{zz>1*tbJ1u& zCXj+R7LC^-gz^EFWFXTjc9RA6bjJx+Ha3s^pimk_y4e~J6{ByL3>NCpa0gO*UjvVf zjZ19jKZL;Y(4e#}EN@W=Uh1JKR$UH+=5cXW`?=UsPg0KsJKR)E|4;?;JU(dgm91*a`HL-@$#)bz<#Z6fbMCKlaAX~_9r+TdI!(k3` zt7|`~)Nw1^C$elS(53Z6AfiH8LdWAgXiVi5N{+>NvQJH99x+4+ zo5rMxpqfv68i!3lk0nhVR;t%}c$SR$;s|IxMsqH;sL>hHP?t}NGe81VR$^FjvLBP{ z?{WTF7pAefF7gy` z=PcuP;*Exvp>_F9?%cR_Aj|wv^29U2(eiIucN?MBmr;XaLM_OgsLCm@>hYG%;c^Mh z_e=LP=e9V8XLr9FWOL)0FqdI-EP~oz`^Z%+wAsXxEZ-KaBntL4$S_1lbZK@_KvY>^ zZwL2SvDqS+IV4zPoNmy8vcV<9R^TZW@H1caX6?=)~m1*^M&2^2RzA5vR#TUW>T1Qc`GvIx!Vw`Sa#l`ZYQHklp>U^!=ALBsjWuF0RZQYZvBS4j; z!>JFE3fjOXU5J-e@Bz`_qMXn;LF!}z`#$uY(i7eKvMsL_AgzTJG*|Rad&!D!U-?M- zLzfkH!<1`Id#4Pxj)uZU9_dG5d8kn0$%>VA0NVF9(vlFYQ!Qf_UKGzm)NKNHtNYx2 zuvM?kWKz-^CS<~Zl;Q$N;zU~m11NPri*qIyj*4XZpbq4?XD}nHXfu@)k+2uHm6(Q` z3e9p_cXM#ztgm1qNu}er%^K7rpXvG|GI{ESl<^v?C3w`=$SIA0nJWjO51^_RdwUF4 zw>JGz1ces@k3�q3`kwQ;BU888;`$;WJ28OyUNR9n+_GyqC7;X zGWF*?|4RlHOoj@pZ6sE)Olt6ZWV)3~0J8B?(GywW2Pv{3czYIoU=)R^V4kJzIs9vHNe?+pFS5eZX*wiOS75JIJsdhbWW|!Vx{EA?Osq3qC)J=m1fx+bE(6Bv|bvR)DY6V9PvGKf% z2trQxH-B!fis?9~?5w8Z23jAchS!sC64?Z} z6OYEa(Muxf@UXai?QXMr$bs@>R_wZA+g=dhzeB}>3)GV!l}>C47P01$h4K*{c1(y| z*9=JhE91C*3#XYVVRmZ6h{a3d|F|;gm<~T|avdku6@nx9XGF1T8FSPB?`ocV5vdQ* zb8!W>xl@7&n7`p{e5^}QJv!{f)$A1gK{$;5^HZ9qG;30 z{G(BFK<$^)P~lQiJf!oYH`95?*FR7u^u)sBv{do1jSL!iHn^rv}423?YG#(5rpEr2Y9&;#t>I1WNl??MIv%%WwHp7VT5B+zB!j5bZ`g8L3LfG1O1qUU z9aI(R)KB-u15NM;{IqYHG$L(?FFd5>Ut^{MuByUMcqYcTDoO_M*m4m?w80}(2sve! zJcE%Q72DSJ*>_Na6x0r=e>r|mBr%AH4vS~MLG0Q>+JhDS;t+IS)xj?bm;!(5!Edeh zc4F6AHp5zx6cGiki>VXZ>kNw%i(!E^V^pwg)^R&;I|{+ad)W*iF%vm4gFlnrEoM!D ze}(4OB6{Ib`U5UCVR?$;UuYg9EV2)DC-(?8>iwpDZ8f$V=p-@zZeIcbCdDTOIrwX3a0k!E>+ z)>m7*E^h*4M}c1Sad$WWe3&<|B5#0nc~kUo@7T8T2xJV~L)N^xvji@FchFc)4l8z? zIY7?fxXeamkr6P%PQJhU&+dL&a5ZQorf=_#FF6zc$u`EY7F10N{`>leUG9rfT9>!X zdE&d6d|3mV_VW`nKI!hOd*+D3snpfEVBf|EvuJf3B0CE||L@YoyB|1n?%d@WGiH4H z-o$yg+)IhsXxP_*C{SvLd0o21gX$c^_|Ldvu>5edK};Ok^|bZKZGE)*=Ey@PFsc{Wd!6 R-3I^w002ovPDHLkV1nKx-0T1V diff --git a/Oqtane.Application/Build/release.cmd b/Oqtane.Application/Build/release.cmd deleted file mode 100644 index a71d781e..00000000 --- a/Oqtane.Application/Build/release.cmd +++ /dev/null @@ -1,2 +0,0 @@ -del "*.nupkg" -"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application diff --git a/Oqtane.Application/Build/release.sh b/Oqtane.Application/Build/release.sh deleted file mode 100644 index 0a01b394..00000000 --- a/Oqtane.Application/Build/release.sh +++ /dev/null @@ -1 +0,0 @@ -"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application \ No newline at end of file