From 8d862f75ee4ad4cfe4f1f04a1cc7e38aa02a22fb Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Wed, 22 Apr 2020 22:27:59 +0200
Subject: [PATCH] Improve dotnet publish arguments

---
 .github/workflows/ci.yml | 22 +++++++++++-----------
 .travis.yml              |  6 +++---
 Dockerfile.Service.arm   |  2 +-
 Dockerfile.Service.arm64 |  2 +-
 Dockerfile.Service.x64   |  2 +-
 Dockerfile.arm           |  2 +-
 Dockerfile.arm64         |  2 +-
 Dockerfile.x64           |  2 +-
 appveyor.yml             |  6 +++---
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 765843b1d..1442e8618 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,12 +74,12 @@ jobs:
 
         publish() {
             if [ "$1" = 'generic' ]; then
-                local variantArgs="/p:UseAppHost=false"
+                local variantArgs="-p:UseAppHost=false"
             else
-                local variantArgs="-r $1 /p:PublishTrimmed=true"
+                local variantArgs="-p:PublishTrimmed=true -r $1"
             fi
 
-            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore --nologo "/p:ASFVariant=$1" $variantArgs
+            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" "-p:ASFVariant=$1" --no-restore --nologo $variantArgs
 
             # If we include any overlay for this variant, copy it to output directory
             if [ -d "ArchiSteamFarm/overlay/${1}" ]; then
@@ -124,20 +124,18 @@ jobs:
             Set-Location "$env:GITHUB_WORKSPACE"
 
             if ($variant -like '*-netf') {
-                $compressionMethod = 'Deflate' # This depends on what ZipArchive supports on given platform
                 $targetFramework = $env:NET_FRAMEWORK_VERSION
             } else {
-                $compressionMethod = 'Deflate64' # This depends on what ZipArchive supports on given platform
                 $targetFramework = $env:NET_CORE_VERSION
             }
 
             if ($variant -like 'generic*') {
-                $variantArgs = '/p:UseAppHost=false'
+                $variantArgs = '-p:UseAppHost=false'
             } else {
-                $variantArgs = '-r', "$variant", '/p:PublishTrimmed=true'
+                $variantArgs = '-p:PublishTrimmed=true', '-r', "$variant"
             }
 
-            dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" --no-restore --nologo "/p:ASFVariant=$variant" $variantArgs
+            dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" "-p:ASFVariant=$variant" --no-restore --nologo $variantArgs
 
             if ($LastExitCode -ne 0) {
                 throw "Last command failed."
@@ -148,9 +146,11 @@ jobs:
                 Copy-Item "ArchiSteamFarm\overlay\$variant\*" "out\$variant"
             }
 
-            # Include .ico file for non-Windows targets
-            if (!(Test-Path "out\$variant\ArchiSteamFarm.exe" -PathType Leaf)) {
-                Copy-Item 'resources\ASF.ico' "out\$variant\ArchiSteamFarm.ico"
+            # Until https://github.com/dotnet/cli/issues/3267 happens, we'll hack dotnet binary icon on Windows and include .ico file on other platforms
+            if ($targetFramework -ne "$env:NET_FRAMEWORK_VERSION") {
+                if (!(Test-Path "out\$variant\ArchiSteamFarm.exe" -PathType Leaf)) {
+                    Copy-Item 'resources\ASF.ico' "out\$variant\ArchiSteamFarm.ico"
+                }
             }
         }
 
diff --git a/.travis.yml b/.travis.yml
index 6b7ab857d..41e559a87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,12 +37,12 @@ script:
 
     publish() {
         if [ "$1" = 'generic' ]; then
-            local variantArgs="/p:UseAppHost=false"
+            local variantArgs="-p:UseAppHost=false"
         else
-            local variantArgs="-r $1 /p:PublishTrimmed=true"
+            local variantArgs="-p:PublishTrimmed=true -r $1"
         fi
 
-        dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore --nologo "/p:ASFVariant=$1" $variantArgs
+        dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" "-p:ASFVariant=$1" --no-restore --nologo $variantArgs
 
         # If we include any overlay for this variant, copy it to output directory
         if [ -d "ArchiSteamFarm/overlay/${1}" ]; then
diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index 4b7b02916..7797ef40a 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' -r 'linux-arm' --nologo /p:ASFVariant=linux-arm /p:PublishTrimmed=true && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm -p:PublishTrimmed=true -r linux-arm --nologo && \
     cp "ArchiSteamFarm/overlay/linux-arm/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh"
 
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm32v7 AS runtime
diff --git a/Dockerfile.Service.arm64 b/Dockerfile.Service.arm64
index 589459c4c..79d98bc9a 100644
--- a/Dockerfile.Service.arm64
+++ b/Dockerfile.Service.arm64
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' -r 'linux-arm64' --nologo /p:ASFVariant=linux-arm64 /p:PublishTrimmed=true && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-arm64 -p:PublishTrimmed=true -r linux-arm64 --nologo && \
     cp "ArchiSteamFarm/overlay/linux-arm64/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh"
 
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim-arm64v8 AS runtime
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index a58c04fe2..82e4ded44 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' -r 'linux-x64' --nologo /p:ASFVariant=linux-x64 /p:PublishTrimmed=true && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=linux-x64 -p:PublishTrimmed=true -r linux-x64 --nologo && \
     cp "ArchiSteamFarm/overlay/linux-x64/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh"
 
 FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim AS runtime
diff --git a/Dockerfile.arm b/Dockerfile.arm
index aa8ea3803..40d2e4cf2 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' --nologo /p:ASFVariant=docker /p:UseAppHost=false && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:UseAppHost=false -r linux-arm --nologo --self-contained false && \
     cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh"
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7 AS runtime
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 769beda15..9bc458306 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' --nologo /p:ASFVariant=docker /p:UseAppHost=false && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:UseAppHost=false -r linux-arm64 --nologo --self-contained false && \
     cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh"
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm64v8 AS runtime
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index 79a15ec0c..72db2b0d2 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -20,7 +20,7 @@ RUN dotnet --info && \
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
     dotnet clean ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" --nologo && \
-    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' --nologo /p:ASFVariant=docker /p:UseAppHost=false && \
+    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o out -p:ASFVariant=docker -p:UseAppHost=false -r linux-x64 --nologo --self-contained false && \
     cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh"
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime
diff --git a/appveyor.yml b/appveyor.yml
index 541a078d6..07869cb89 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -152,12 +152,12 @@ after_test:
         }
 
         if ($variant -like 'generic*') {
-            $variantArgs = '/p:UseAppHost=false'
+            $variantArgs = '-p:UseAppHost=false'
         } else {
-            $variantArgs = '-r', "$variant", '/p:PublishTrimmed=true'
+            $variantArgs = '-p:PublishTrimmed=true', '-r', "$variant"
         }
 
-        dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" --no-restore --nologo "/p:ASFVariant=$variant" $variantArgs
+        dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" "-p:ASFVariant=$variant" --no-restore --nologo $variantArgs
 
         if ($LastExitCode -ne 0) {
             throw "Last command failed."