Enable SingleFilePublish for non-windows variants

This commit is contained in:
JustArchi
2019-12-07 23:55:44 +01:00
parent 78df291018
commit 16736dd145
2 changed files with 19 additions and 6 deletions

View File

@@ -37,12 +37,19 @@ script:
publish() {
if [ "$1" = 'generic' ]; then
# TODO: Workaround https://github.com/mono/linker/issues/286 (don't forget to remove it from docker files too)
dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore --nologo "/p:ASFVariant=$1" "/p:UseAppHost=false"
local variantArgs="/p:UseAppHost=false"
else
dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore --nologo "/p:ASFVariant=$1" "/p:PublishTrimmed=true" "/p:PublishSingleFile=false"
local variantArgs="-r $1 /p:PublishTrimmed=true"
# TODO: https://github.com/dotnet/sdk/issues/4022
case "$1" in
'win-'*) ;;
*) local variantArgs="$variantArgs /p:PublishSingleFile=true" ;;
esac
fi
dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore --nologo "/p:ASFVariant=$1" $variantArgs
# If we include any overlay for this variant, copy it to output directory
if [ -d "ArchiSteamFarm/overlay/${1}" ]; then
cp "ArchiSteamFarm/overlay/${1}/"* "out/${1}"

View File

@@ -154,12 +154,18 @@ after_test:
}
if ($variant -like 'generic*') {
# TODO: Workaround https://github.com/mono/linker/issues/286 (don't forget to remove it from docker files too)
dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" --no-restore --nologo "/p:ASFVariant=$variant" "/p:UseAppHost=false"
$variantArgs = '/p:UseAppHost=false'
} else {
dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" -r "$variant" --no-restore --nologo "/p:ASFVariant=$variant" "/p:PublishTrimmed=true" "/p:PublishSingleFile=false"
$variantArgs = '-r', "$variant", '/p:PublishTrimmed=true'
# TODO: https://github.com/dotnet/sdk/issues/4022
if ($variant -NotLike 'win-*') {
$variantArgs += '/p:PublishSingleFile=true'
}
}
dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" --no-restore --nologo "/p:ASFVariant=$variant" $variantArgs
if ($LastExitCode -ne 0) {
throw "Last command failed."
}