From bb0e92a83002d1f07fb19c1029754b396a62e8b5 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sat, 26 Sep 2020 22:38:26 +1000
Subject: [PATCH] Change build path of executables to output/dll but gooder

fixes 5ae13a230, 49a18d83b
---
 src/MainSlnCommon.props     |  2 +-
 src/MainSlnExecutable.props | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index d7c5aa1490..f54e1b6dea 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -6,7 +6,7 @@
 		<DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile>
 		<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
 		<NoWarn>CS1573;CS1591;NU1701</NoWarn>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
+		<OutputPath>$(ProjectDir)../../output/dll</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>
 		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
diff --git a/src/MainSlnExecutable.props b/src/MainSlnExecutable.props
index 4ec39da72d..92a921166d 100644
--- a/src/MainSlnExecutable.props
+++ b/src/MainSlnExecutable.props
@@ -1,6 +1,7 @@
 <Project>
 	<Import Project="MainSlnCommon.props" />
 	<PropertyGroup>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -9,4 +10,13 @@
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<ItemGroup>
+			<NotExecFilesFromExecProj Include="$(OutputPath)*.deps.json" />
+			<NotExecFilesFromExecProj Include="$(OutputPath)*.dll" />
+			<NotExecFilesFromExecProj Include="$(OutputPath)*.pdb" />
+			<NotExecFilesFromExecProj Include="$(OutputPath)*.xml" />
+		</ItemGroup>
+		<Move Condition=" $(IsTargetingNetFramework) " SourceFiles="@(NotExecFilesFromExecProj)" DestinationFolder="$(OutputPath)dll/" />
+	</Target>
 </Project>