From ddddb309fc8734db138cd286b1b2006160b12fdc Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 3 May 2020 00:03:32 -0400
Subject: [PATCH] Revert "Migrate EmuHawk's post-build targets to shell
 scripts"

This reverts commit 0ff90bf13132188f0a6170b573604d0e380b0657.
---
 Dist/copy_assets_and_emuhawk_to_output.bat             |  1 -
 Dist/copy_assets_and_emuhawk_to_output.sh              |  2 --
 .../BizHawk.Client.EmuHawk.csproj                      | 10 ++++++----
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 Dist/copy_assets_and_emuhawk_to_output.bat
 delete mode 100755 Dist/copy_assets_and_emuhawk_to_output.sh

diff --git a/Dist/copy_assets_and_emuhawk_to_output.bat b/Dist/copy_assets_and_emuhawk_to_output.bat
deleted file mode 100644
index 4c92412abc..0000000000
--- a/Dist/copy_assets_and_emuhawk_to_output.bat
+++ /dev/null
@@ -1 +0,0 @@
-REM TODO
diff --git a/Dist/copy_assets_and_emuhawk_to_output.sh b/Dist/copy_assets_and_emuhawk_to_output.sh
deleted file mode 100755
index d45a002b69..0000000000
--- a/Dist/copy_assets_and_emuhawk_to_output.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.." && (cp -r Assets/* output; cp src/BizHawk.Client.EmuHawk/bin/*/* output)
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index bf1d685db5..8ba01fbebb 100644
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -5,7 +5,7 @@
 		<ApplicationIcon>images/logo.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
-		<OutputPath>$(ProjectDir)bin</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
@@ -634,8 +634,10 @@
 		<Compile Update="tools/Watch/WatchValueBox.cs" SubType="Component" />
 		<Compile Update="UpdateChecker.cs" SubType="Code" />
 	</ItemGroup>
-	<Target Name="PreBuild" AfterTargets="PreBuildEvent">
-		<Exec Command='"$(ProjectDir)..\..\Dist\copy_assets_and_emuhawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
-		<Exec Command='"$(ProjectDir)../../Dist/copy_assets_and_emuhawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
+	<Target Name="AfterBuild">
+		<ItemGroup>
+			<AssetFiles Include="$(ProjectDir)../../Assets/**/*.*" Exclude="$(ProjectDir)../../Assets/**/.gitempty;$(ProjectDir)../../Assets/**/.gitignore" />
+		</ItemGroup>
+		<Copy SourceFiles="@(AssetFiles)" DestinationFolder="$(OutDir)%(RecursiveDir)" SkipUnchangedFiles="true" />
 	</Target>
 </Project>