From 000e2af543d72361f2974f59e5c41507d9ea687b Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 22 Sep 2020 07:35:54 +1000
Subject: [PATCH] Extract .props for executable projects

---
 .../BizHawk.Client.DiscoHawk.csproj                  |  4 +---
 .../BizHawk.Client.EmuHawk.csproj                    |  9 +--------
 src/MainSlnExecutable.props                          | 12 ++++++++++++
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 src/MainSlnExecutable.props

diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index b16a6c6d6e..9ad503c9df 100755
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../MainSlnExecutable.props" />
 	<PropertyGroup>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
-		<OutputType>Exe</OutputType>
 		<TargetFramework>net48</TargetFramework>
-		<TargetName>DiscoHawk</TargetName>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 5d5c4dbe6c..4028b58a7b 100755
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1,21 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../MainSlnExecutable.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<ApplicationIcon>images/logo.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<TargetFramework>net48</TargetFramework>
-		<TargetName>EmuHawk</TargetName>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-		<OutputType>Exe</OutputType>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<OutputType>WinExe</OutputType>
-	</PropertyGroup>
 <!--
 	<PropertyGroup>
 		<AppDesignerFolder>Properties</AppDesignerFolder>
diff --git a/src/MainSlnExecutable.props b/src/MainSlnExecutable.props
new file mode 100644
index 0000000000..3dc806a722
--- /dev/null
+++ b/src/MainSlnExecutable.props
@@ -0,0 +1,12 @@
+<Project>
+	<PropertyGroup>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
+		<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+		<OutputType>Exe</OutputType>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<OutputType>WinExe</OutputType>
+	</PropertyGroup>
+</Project>