From 41ecfb1d02e7f3c9c467cb3cf6674f8a17a736bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C3=B6ls?= <6608231+Abrynos@users.noreply.github.com> Date: Tue, 19 Jul 2022 22:20:18 +0200 Subject: [PATCH] Move copying of overlay files to ArchiSteamFarm.csproj (#2650) * Move copying of overlay files to ArchiSteamFarm.csproj * Fix build on Windows * Try to make it more reliable * Update ArchiSteamFarm.csproj * Update ArchiSteamFarm.csproj * Revert "Update ArchiSteamFarm.csproj" This reverts commit ba41b2e3c1ca2df9ddc3e07b32c1508b4da47db5. * Rename Co-authored-by: JustArchi --- .github/workflows/publish.yml | 22 ------------------- ArchiSteamFarm/ArchiSteamFarm.csproj | 16 ++++++++++++++ .../linux/ArchiSteamFarm-Service.sh | 0 .../linux/ArchiSteamFarm@.service | 0 .../osx/ArchiSteamFarm-Service.sh | 0 .../generic-netf/ArchiSteamFarm-Service.sh | 0 .../generic-netf/ArchiSteamFarm.sh | 0 .../generic-netf/ArchiSteamFarm@.service | 0 .../generic/ArchiSteamFarm-Service.sh | 0 .../generic/ArchiSteamFarm.cmd | 0 .../generic/ArchiSteamFarm.sh | 0 .../generic/ArchiSteamFarm@.service | 0 12 files changed, 16 insertions(+), 22 deletions(-) rename ArchiSteamFarm/overlay/{ => variant-base}/linux/ArchiSteamFarm-Service.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-base}/linux/ArchiSteamFarm@.service (100%) rename ArchiSteamFarm/overlay/{ => variant-base}/osx/ArchiSteamFarm-Service.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic-netf/ArchiSteamFarm-Service.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic-netf/ArchiSteamFarm.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic-netf/ArchiSteamFarm@.service (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic/ArchiSteamFarm-Service.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic/ArchiSteamFarm.cmd (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic/ArchiSteamFarm.sh (100%) rename ArchiSteamFarm/overlay/{ => variant-specific}/generic/ArchiSteamFarm@.service (100%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index af814b4cf..cda98230e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -133,17 +133,6 @@ jobs: dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" "-p:ASFVariant=$1" -p:ContinuousIntegrationBuild=true --no-restore --nologo $variantArgs - # If we're including any overlay for this variant, copy it to output directory - variant_os="$(echo "$1" | cut -d '-' -f 1)" - - if [ -d "ArchiSteamFarm/overlay/${variant_os}" ]; then - cp -pR "ArchiSteamFarm/overlay/${variant_os}/"* "out/${1}" - fi - - if [ "$1" != "$variant_os" ] && [ -d "ArchiSteamFarm/overlay/${1}" ]; then - cp -pR "ArchiSteamFarm/overlay/${1}/"* "out/${1}" - fi - # If we're including SteamTokenDumper plugin for this framework, copy it to output directory if [ -d "out/${STEAM_TOKEN_DUMPER_NAME}/${NET_CORE_VERSION}" ]; then mkdir -p "out/${1}/plugins/${STEAM_TOKEN_DUMPER_NAME}" @@ -254,17 +243,6 @@ jobs: throw "Last command failed." } - # If we're including any overlay for this variant, copy it to output directory - $variant_os = $variant.Split('-', 2)[0]; - - if (Test-Path "ArchiSteamFarm\overlay\$variant_os" -PathType Container) { - Copy-Item "ArchiSteamFarm\overlay\$variant_os\*" "out\$variant" -Recurse - } - - if (($variant -ne $variant_os) -and (Test-Path "ArchiSteamFarm\overlay\$variant" -PathType Container)) { - Copy-Item "ArchiSteamFarm\overlay\$variant\*" "out\$variant" -Recurse - } - # If we're including SteamTokenDumper plugin for this framework, copy it to output directory if (Test-Path "out\$env:STEAM_TOKEN_DUMPER_NAME\$targetFramework" -PathType Container) { if (!(Test-Path "out\$variant\plugins\$env:STEAM_TOKEN_DUMPER_NAME" -PathType Container)) { diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index 9b730a797..9cb082352 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -78,4 +78,20 @@ www\%(RecursiveDir)%(Filename)%(Extension) + + + + PreserveNewest + true + %(RecursiveDir)%(Filename)%(Extension) + + + + + + PreserveNewest + true + %(RecursiveDir)%(Filename)%(Extension) + + diff --git a/ArchiSteamFarm/overlay/linux/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm-Service.sh similarity index 100% rename from ArchiSteamFarm/overlay/linux/ArchiSteamFarm-Service.sh rename to ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm-Service.sh diff --git a/ArchiSteamFarm/overlay/linux/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm@.service similarity index 100% rename from ArchiSteamFarm/overlay/linux/ArchiSteamFarm@.service rename to ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm@.service diff --git a/ArchiSteamFarm/overlay/osx/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-base/osx/ArchiSteamFarm-Service.sh similarity index 100% rename from ArchiSteamFarm/overlay/osx/ArchiSteamFarm-Service.sh rename to ArchiSteamFarm/overlay/variant-base/osx/ArchiSteamFarm-Service.sh diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm-Service.sh similarity index 100% rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm-Service.sh rename to ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm-Service.sh diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm.sh similarity index 100% rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm.sh rename to ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm.sh diff --git a/ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm@.service similarity index 100% rename from ArchiSteamFarm/overlay/generic-netf/ArchiSteamFarm@.service rename to ArchiSteamFarm/overlay/variant-specific/generic-netf/ArchiSteamFarm@.service diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm-Service.sh similarity index 100% rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh rename to ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm-Service.sh diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.cmd similarity index 100% rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm.cmd rename to ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.cmd diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.sh similarity index 100% rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh rename to ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm.sh diff --git a/ArchiSteamFarm/overlay/generic/ArchiSteamFarm@.service b/ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm@.service similarity index 100% rename from ArchiSteamFarm/overlay/generic/ArchiSteamFarm@.service rename to ArchiSteamFarm/overlay/variant-specific/generic/ArchiSteamFarm@.service