From 02dc42d4533c7844da631447c7df7ed936166a72 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 6 Feb 2020 23:51:46 +1000
Subject: [PATCH] Use MSBuild to copy output instead of bash in external tool
 template

---
 ExternalToolProjects/.build_net48_from_cwd_debug.sh            | 3 +--
 ExternalToolProjects/.build_net48_from_cwd_release.sh          | 3 +--
 ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj        | 2 +-
 ExternalToolProjects/Common.props                              | 2 +-
 ExternalToolProjects/DBMan/DBMan.csproj                        | 2 +-
 ExternalToolProjects/HelloWorld/HelloWorld.csproj              | 2 +-
 ...T48ExternalToolForm.props => NET48ExternalToolForm.targets} | 3 +++
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename ExternalToolProjects/{NET48ExternalToolForm.props => NET48ExternalToolForm.targets} (85%)

diff --git a/ExternalToolProjects/.build_net48_from_cwd_debug.sh b/ExternalToolProjects/.build_net48_from_cwd_debug.sh
index 2f0184cb55..d66339ad2f 100755
--- a/ExternalToolProjects/.build_net48_from_cwd_debug.sh
+++ b/ExternalToolProjects/.build_net48_from_cwd_debug.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-name="$(basename "$PWD").dll"
-CscToolExe="$(which csc)" dotnet build -c Debug -m && cp -f "bin/Debug/net48/$name" "../../output/ExternalTools/$name"
+CscToolExe="$(which csc)" dotnet build -c Debug -m
diff --git a/ExternalToolProjects/.build_net48_from_cwd_release.sh b/ExternalToolProjects/.build_net48_from_cwd_release.sh
index 40d7ba70db..6ddd929291 100755
--- a/ExternalToolProjects/.build_net48_from_cwd_release.sh
+++ b/ExternalToolProjects/.build_net48_from_cwd_release.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-name="$(basename "$PWD").dll"
-CscToolExe="$(which csc)" dotnet build -c Release -m && cp -f "bin/Release/net48/$name" "../../output/ExternalTools/$name"
+CscToolExe="$(which csc)" dotnet build -c Release -m
diff --git a/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj b/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
index 08c92b40f0..49b9fd5450 100644
--- a/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
+++ b/ExternalToolProjects/AutoGenConfig/AutoGenConfig.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="$(ProjectDir)../Common.props" />
-	<Import Project="$(ProjectDir)../NET48ExternalToolForm.props" />
+	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<ItemGroup>
 		<Reference Include="System.ComponentModel.DataAnnotations" />
 		<Compile Update="AutoGenConfigForm.cs" SubType="Form" />
diff --git a/ExternalToolProjects/Common.props b/ExternalToolProjects/Common.props
index d078c71bf5..5a5aaa3ce4 100644
--- a/ExternalToolProjects/Common.props
+++ b/ExternalToolProjects/Common.props
@@ -5,7 +5,7 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<LangVersion>8.0</LangVersion>
 		<Nullable>enable</Nullable>
-		<OutputPath>$(ProjectDir)bin/$(Configuration)</OutputPath>
+		<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
 		<RunCodeAnalysis>false</RunCodeAnalysis>
diff --git a/ExternalToolProjects/DBMan/DBMan.csproj b/ExternalToolProjects/DBMan/DBMan.csproj
index f0752c9d9c..c3dff77308 100644
--- a/ExternalToolProjects/DBMan/DBMan.csproj
+++ b/ExternalToolProjects/DBMan/DBMan.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="$(ProjectDir)../Common.props" />
-	<Import Project="$(ProjectDir)../NET48ExternalToolForm.props" />
+	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<PropertyGroup>
 		<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
 		<GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime>
diff --git a/ExternalToolProjects/HelloWorld/HelloWorld.csproj b/ExternalToolProjects/HelloWorld/HelloWorld.csproj
index 7827027f2b..c0ec44b5f2 100644
--- a/ExternalToolProjects/HelloWorld/HelloWorld.csproj
+++ b/ExternalToolProjects/HelloWorld/HelloWorld.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="$(ProjectDir)../Common.props" />
-	<Import Project="$(ProjectDir)../NET48ExternalToolForm.props" />
+	<Import Project="$(ProjectDir)../NET48ExternalToolForm.targets" />
 	<ItemGroup>
 		<EmbeddedResource Include="icon_Hello.ico" />
 	</ItemGroup>
diff --git a/ExternalToolProjects/NET48ExternalToolForm.props b/ExternalToolProjects/NET48ExternalToolForm.targets
similarity index 85%
rename from ExternalToolProjects/NET48ExternalToolForm.props
rename to ExternalToolProjects/NET48ExternalToolForm.targets
index 740015a650..4d6a863959 100644
--- a/ExternalToolProjects/NET48ExternalToolForm.props
+++ b/ExternalToolProjects/NET48ExternalToolForm.targets
@@ -24,4 +24,7 @@
 			HintPath="$(ProjectDir)../../output/BizHawk.Emulation.DiscSystem.dll"
 			Private="true" />
 	</ItemGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Copy SourceFiles="$(OutputPath)$(MSBuildProjectName).dll" DestinationFolder="$(ProjectDir)../../output/ExternalTools" />
+	</Target>
 </Project>