From 458514e04b0b59fe3936ea5d4994bb9a1cdf6897 Mon Sep 17 00:00:00 2001 From: KoCoder Date: Thu, 29 Jan 2026 21:32:18 +0100 Subject: [PATCH] New: Add fixProps to bundle all modules correctly --- .gitmodules | 3 +++ Module.AdminModules | 2 +- Module.EventRegistration | 2 +- Module.HallOfFame | 2 +- Module.PremiumArea | 2 +- Theme.SZUAbsolventenverein | 2 +- fixProps | 1 + run-build.sh | 11 ++++++++--- 8 files changed, 17 insertions(+), 8 deletions(-) create mode 160000 fixProps diff --git a/.gitmodules b/.gitmodules index 6e86580..0f63cd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "Module.PremiumArea"] path = Module.PremiumArea url = https://git.kocoder.xyz/Diplomarbeit-Absolventenverein/Module.PremiumArea.git +[submodule "fixProps"] + path = fixProps + url = https://github.com/oqtane/oqtane.FixProps diff --git a/Module.AdminModules b/Module.AdminModules index 002b3ca..46af683 160000 --- a/Module.AdminModules +++ b/Module.AdminModules @@ -1 +1 @@ -Subproject commit 002b3cafffdc470ac59303b592fa10d59ca5c908 +Subproject commit 46af683546d8966d03fc7c3ead19a4a4ee8de2ca diff --git a/Module.EventRegistration b/Module.EventRegistration index 9b1ea5a..e22d360 160000 --- a/Module.EventRegistration +++ b/Module.EventRegistration @@ -1 +1 @@ -Subproject commit 9b1ea5ada119070b8ad79e1032c9ac1f150a86d0 +Subproject commit e22d36042546b6b005ba0cac8a6c44ab01dfc7d4 diff --git a/Module.HallOfFame b/Module.HallOfFame index 2d8c673..26e0571 160000 --- a/Module.HallOfFame +++ b/Module.HallOfFame @@ -1 +1 @@ -Subproject commit 2d8c6736a7b2af3c55578f8478d86eb177bfd342 +Subproject commit 26e05710b3a4cd1a20f035636587bb4d3d70e384 diff --git a/Module.PremiumArea b/Module.PremiumArea index 0942f0b..a1b5d03 160000 --- a/Module.PremiumArea +++ b/Module.PremiumArea @@ -1 +1 @@ -Subproject commit 0942f0b308a1b9278b4c8e6113917f73ce138d84 +Subproject commit a1b5d0371dd071735e80d318a4508e452e15b220 diff --git a/Theme.SZUAbsolventenverein b/Theme.SZUAbsolventenverein index 5b52989..b5e8a43 160000 --- a/Theme.SZUAbsolventenverein +++ b/Theme.SZUAbsolventenverein @@ -1 +1 @@ -Subproject commit 5b529892308260559d60d5b6675dec8b8f8c8de7 +Subproject commit b5e8a436b4ca2c4ea6299afd7bfc48844086a374 diff --git a/fixProps b/fixProps new file mode 160000 index 0000000..10f645b --- /dev/null +++ b/fixProps @@ -0,0 +1 @@ +Subproject commit 10f645be5254f4196e7dde6c60a268d333280159 diff --git a/run-build.sh b/run-build.sh index e7e402b..89295fd 100755 --- a/run-build.sh +++ b/run-build.sh @@ -2,19 +2,24 @@ VERSION="$1" DEBIAN_PACKAGE_PATH="$2" +echo "Building oqtane.framework" + dotnet restore ./oqtane.framework/Oqtane.slnx +dotnet build ./oqtane.framework/Oqtane.slnx dotnet build -c Release ./oqtane.framework/Oqtane.slnx -dotnet publish -c Release ./oqtane.framework/Oqtane.Server/Oqtane.Server.csproj +dotnet publish -c Release ./oqtane.framework/Oqtane.Server/Oqtane.Server.csproj -o ./alumnihub_10.0_amd64/opt/alumnihub + +echo "" +echo "Building Modules and Themes" for module in $(ls . | grep -E 'Module|Theme') do + echo "######## Building $module" dotnet restore ./$module/*.slnx dotnet build -c Release ./$module/*.slnx dotnet publish -c Release ./$module/*.slnx done - - echo $VERSION $DEBIAN_PACKAGE_PATH echo "Version: ${VERSION}" >> $DEBIAN_PACKAGE_PATH/DEBIAN/control