From bb110d4f5ee0204b88f645f12fbc22b268b74bd2 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Tue, 2 Apr 2024 09:15:30 +1000
Subject: [PATCH] Minor refactors to other MSBuild files

---
 ExternalProjects/LibCommon.props                   | 2 +-
 ExternalToolProjects/ExtToolCommon.props           | 3 ---
 ExternalToolProjects/NET48ExternalToolForm.targets | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ExternalProjects/LibCommon.props b/ExternalProjects/LibCommon.props
index af80de829e..6cff7e62d7 100644
--- a/ExternalProjects/LibCommon.props
+++ b/ExternalProjects/LibCommon.props
@@ -7,6 +7,6 @@
 		<None Remove="*.sh" />
 	</ItemGroup>
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Copy SourceFiles="$(OutputPath)$(MSBuildProjectName).dll" DestinationFolder="$(MSBuildProjectDirectory)/../../References/" />
+		<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(MSBuildProjectDirectory)/../../References/" />
 	</Target>
 </Project>
diff --git a/ExternalToolProjects/ExtToolCommon.props b/ExternalToolProjects/ExtToolCommon.props
index 27d5c7f532..43ea3f3039 100644
--- a/ExternalToolProjects/ExtToolCommon.props
+++ b/ExternalToolProjects/ExtToolCommon.props
@@ -1,8 +1,5 @@
 <Project>
 	<Import Project="../Common.props" />
-	<PropertyGroup>
-		<OutputPath>$(MSBuildProjectDirectory)/bin/$(Configuration)/</OutputPath>
-	</PropertyGroup>
 	<ItemGroup>
 		<None Remove="*.sh" />
 	</ItemGroup>
diff --git a/ExternalToolProjects/NET48ExternalToolForm.targets b/ExternalToolProjects/NET48ExternalToolForm.targets
index 36b8c11cd1..f65ba71ec9 100644
--- a/ExternalToolProjects/NET48ExternalToolForm.targets
+++ b/ExternalToolProjects/NET48ExternalToolForm.targets
@@ -31,7 +31,7 @@
 			Private="true" />
 	</ItemGroup>
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Copy SourceFiles="$(OutputPath)$(MSBuildProjectName).dll" DestinationFolder="$(BIZHAWK_DATA_HOME)ExternalTools" />
+		<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BIZHAWK_DATA_HOME)ExternalTools" />
 		<Copy SourceFiles="@(NET48ExternalToolFormDependency)" DestinationFolder="$(BIZHAWK_DATA_HOME)ExternalTools" />
 	</Target>
 </Project>