Change executables' build paths and names

Build/copy_assets_and_emuhawk_to_output.bat

@@ -1,11 +0,0 @@
-CHDIR "%~dp0\.."
-
-ROBOCOPY /E Assets output
-
-FOR /D %%D IN (src\BizHawk.Client.EmuHawk\bin\*) DO (
-	ROBOCOPY %%D output
-	RENAME output\BizHawk.Client.EmuHawk.exe EmuHawk.exe
-	RENAME output\BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config
-	goto end
-)
-:end

Build/copy_assets_and_emuhawk_to_output.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.."
-cp -f -r Assets/* output || printf ""
-cd src/BizHawk.Client.EmuHawk/bin && for d in *; do
-	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.EmuHawk.exe EmuHawk.exe && mv BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config && exit 0
-done

Build/copy_discohawk_to_output.bat

@@ -1,9 +0,0 @@
-CHDIR "%~dp0\.."
-
-FOR /D %%D IN (src\BizHawk.Client.DiscoHawk\bin\*) DO (
-	ROBOCOPY %%D output
-	RENAME output\BizHawk.Client.DiscoHawk.exe DiscoHawk.exe
-	RENAME output\BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config
-	goto end
-)
-:end

Build/copy_discohawk_to_output.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.."
-cd src/BizHawk.Client.DiscoHawk/bin && for d in *; do
-	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.DiscoHawk.exe DiscoHawk.exe && mv BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config && exit 0
-done

Build/postbuild_emuhawk.bat

@@ -0,0 +1,3 @@
+@CHDIR "%~dp0\.."
+@ROBOCOPY /E Assets output
+@EXIT 0

Build/postbuild_emuhawk.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "$(dirname "$0")/.."
+cp -f -r Assets/* output || printf ""

src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-		<OutputPath>$(ProjectDir)bin</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net48</TargetFramework>
+		<TargetName>DiscoHawk</TargetName>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -82,8 +84,4 @@
 		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
 -->
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command='"$(ProjectDir)..\..\Build\copy_discohawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
-		<Exec Command='"$(ProjectDir)../../Build/copy_discohawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
-	</Target>
 </Project>

src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -2,12 +2,14 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<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>
+		<TargetName>EmuHawk</TargetName>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -638,7 +640,7 @@
 		<Compile Update="UpdateChecker.cs" SubType="Code" />
 	</ItemGroup>
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command='"$(ProjectDir)..\..\Build\copy_assets_and_emuhawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)..\..\Build\postbuild_emuhawk.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
-		<Exec Command='"$(ProjectDir)../../Build/copy_assets_and_emuhawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)../../Build/postbuild_emuhawk.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
 	</Target>
 </Project>