From 63bc73d9d2f48de237cee45152b16df5768a547a Mon Sep 17 00:00:00 2001 From: penev92 Date: Sat, 18 Feb 2023 14:02:51 +0100 Subject: [PATCH] Change the way the output directory is set during packaging --- packaging/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/functions.sh b/packaging/functions.sh index 063239fdd1..8bceca1430 100755 --- a/packaging/functions.sh +++ b/packaging/functions.sh @@ -80,7 +80,7 @@ install_assemblies() ( done fi else - dotnet publish -c Release -p:TargetPlatform="${TARGETPLATFORM}" -p:CopyGenericLauncher="${COPY_GENERIC_LAUNCHER}" -p:CopyCncDll="${COPY_CNC_DLL}" -p:CopyD2kDll="${COPY_D2K_DLL}" -r "${TARGETPLATFORM}" -o "${DEST_PATH}" --self-contained true + dotnet publish -c Release -p:TargetPlatform="${TARGETPLATFORM}" -p:CopyGenericLauncher="${COPY_GENERIC_LAUNCHER}" -p:CopyCncDll="${COPY_CNC_DLL}" -p:CopyD2kDll="${COPY_D2K_DLL}" -r "${TARGETPLATFORM}" -p:PublishDir="${DEST_PATH}" --self-contained true fi cd "${ORIG_PWD}" ) @@ -156,7 +156,7 @@ install_windows_launcher() ( FAQ_URL="${7}" rm -rf "${SRC_PATH}/OpenRA.WindowsLauncher/obj" || : - dotnet publish "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -c Release -r "${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:TargetPlatform="${TARGETPLATFORM}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}" -o "${DEST_PATH}" --self-contained true + dotnet publish "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -c Release -r "${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:TargetPlatform="${TARGETPLATFORM}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}" -p:PublishDir="${DEST_PATH}" --self-contained true # NET 6 is unable to customize the application host for windows when compiling from Linux, # so we must patch the properties we need in the PE header.