From d6bf21cf249610d465ef3ffedaaaf69aef91e1d6 Mon Sep 17 00:00:00 2001
From: Abrynos <6608231+Abrynos@users.noreply.github.com>
Date: Tue, 19 Jul 2022 18:35:46 +0200
Subject: [PATCH] Move copying of overlay files to ArchiSteamFarm.csproj

---
 .github/workflows/publish.yml        | 22 ----------------------
 ArchiSteamFarm/ArchiSteamFarm.csproj | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 22 deletions(-)

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..c54e8d4ed 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -78,4 +78,20 @@
 			<Link>www\%(RecursiveDir)%(Filename)%(Extension)</Link>
 		</Content>
 	</ItemGroup>
+
+	<ItemGroup Condition="Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant.Split('-')[0]))))">
+		<Content Include="overlay/$(ASFVariant.Split('-')[0])/**/*.*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup Condition="Exists($([System.IO.Path]::Combine('overlay', $(ASFVariant))))">
+		<Content Include="overlay/$(ASFVariant)/**/*.*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+		</Content>
+	</ItemGroup>
 </Project>